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"
10 years ago · c8b4c064cc
parent 44b6db53f4
commit c8b4c064cc
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -23,6 +23,7 @@ Name[en_GB]=Language
 Name[es]=Idioma
 Name[et]=Keel
 Name[fi]=Kieli
+Name[fr]=Langage
 Name[he]=שפה
 Name[it]=Lingua
 Name[ko]=언어