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"
11 years ago · e285e51c9e
parent 70378002c4
commit e285e51c9e
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -15,6 +15,7 @@ Name=Translations
 Name[ar]=الترجمات
 Name[bs]=Prevodi
 Name[ca]=Traduccions
+Name[ca@valencia]=Traduccions
 Name[cs]=Překlady
 Name[da]=Oversættelser
 Name[de]=Übersetzungen