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"
6 years ago · e2fa4cedba
parent 3a357ea2d1
commit e2fa4cedba
1 changed files with 1 additions and 1 deletions
--- a/menu/desktop/kf5-development-translation.directory
+++ b/menu/desktop/kf5-development-translation.directory
@ -87,7 +87,7 @@ Name[ug]=تەرجىمىسى
 Name[uk]=Переклад
 Name[uz]=Tarjima
 Name[uz@cyrillic]=Таржима
-Name[vi]=Phiên dịch
+Name[vi]=Biên dịch
 Name[wa]=Ratournaedje
 Name[x-test]=xxTranslationxx
 Name[zh_CN]=翻译