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 · 051847ea72
parent 8c1a422d49
commit 051847ea72
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -22,6 +22,7 @@ Name[el]=Γλώσσα
 Name[en_GB]=Language
 Name[es]=Idioma
 Name[et]=Keel
+Name[fi]=Kieli
 Name[he]=שפה
 Name[it]=Lingua
 Name[nl]=Taal