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"
8 years ago · 79466b1bdf
parent 49c493fa98
commit 79466b1bdf
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -12,6 +12,7 @@ X-KDE-System-Settings-Parent-Category=regionalsettings
 X-KDE-Weight=40

 Name=Language
+Name[ar]=اللغة
 Name[ca]=Idioma
 Name[ca@valencia]=Idioma
 Name[cs]=Jazyk