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 · 74f50ec30c
parent 6631c69b2d
commit 74f50ec30c
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -22,6 +22,7 @@ Name[es]=Idioma
 Name[it]=Lingua
 Name[nl]=Taal
 Name[nn]=Språk
+Name[pa]=ਭਾਸ਼ਾ
 Name[pl]=Język
 Name[pt]=Língua
 Name[sl]=Jezik