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 · 00eebe09e0
parent 73c4c24fa3
commit 00eebe09e0
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[ca@valencia]=Idioma
+Name[cs]=Jazyk
 Name[es]=Idioma
 Name[nl]=Taal
 Name[nn]=Språk