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"
7 years ago · 3a75ef844e
parent e455e34969
commit 3a75ef844e
1 changed files with 1 additions and 1 deletions
--- a/effects/zoom/zoom_config.desktop
+++ b/effects/zoom/zoom_config.desktop
@ -40,7 +40,7 @@ Name[hne]=जूम
 Name[hr]=Povećanje
 Name[hu]=Kinagyítás
 Name[ia]=Zoom
-Name[id]=Zoom
+Name[id]=Zum 
 Name[is]=Aðdráttur
 Name[it]=Ingrandimento
 Name[ja]=ズーム