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 · d086ed54d8
parent 1ed7a46180
commit d086ed54d8
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -27,6 +27,7 @@ Name[et]=Tõlked
 Name[fi]=Käännökset
 Name[fr]=Traductions
 Name[gl]=Traducións
+Name[he]=תרגומים
 Name[hu]=Fordítások
 Name[id]=Terjemahan
 Name[is]=Þýðingar