mirror of
https://github.com/KDE/krfb
synced 2026-07-01 07:31:16 -07:00
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
@@ -8,6 +8,7 @@ X-DocPath=krfb/index.html
|
|||||||
Terminal=false
|
Terminal=false
|
||||||
Name=Krfb
|
Name=Krfb
|
||||||
Name[ar]=كرفب
|
Name[ar]=كرفب
|
||||||
|
Name[ast]=Krfb
|
||||||
Name[bg]=Krfb
|
Name[bg]=Krfb
|
||||||
Name[bn]=কে-আর-এফ-বি
|
Name[bn]=কে-আর-এফ-বি
|
||||||
Name[br]=Krfb
|
Name[br]=Krfb
|
||||||
|
|||||||
Reference in New Issue
Block a user