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 · 10c7011ee8
parent ac1f4a4a00
commit 10c7011ee8
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -14,6 +14,7 @@ X-KDE-Weight=40
 Name=Language
 Name[ca]=Idioma
 Name[es]=Idioma
+Name[nl]=Taal
 Name[pl]=Język
 Name[pt]=Língua
 Name[sv]=Språk