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"
9 years ago · 9b22583b77
parent c256ef61fb
commit 9b22583b77
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -29,6 +29,7 @@ Name[hu]=Nyelv
 Name[it]=Lingua
 Name[ja]=言語
 Name[ko]=언어
+Name[lt]=Kalba
 Name[nl]=Taal
 Name[nn]=Språk
 Name[pa]=ਭਾਸ਼ਾ