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"

effects/flipswitch/flipswitch_config.desktop

@@ -32,7 +32,7 @@ Name[hne]=फ्लिप स्विच
 Name[hr]=Naslagani prozori – promjena
 Name[hu]=Billenős váltódoboz
 Name[ia]=Commutator de  colpetto (Flip)
-Name[id]=Melipat
+Name[id]=Alih Lipatan
 Name[is]=Flettirofi
 Name[it]=Scambiafinestre a pila
 Name[ja]=フリップスイッチ

effects/invert/invert_config.desktop

@@ -37,7 +37,7 @@ Name[hne]=उलटव
 Name[hr]=Izokretanje
 Name[hu]=Invertálás
 Name[ia]=Inverte
-Name[id]=Balik
+Name[id]=Kebalikan
 Name[is]=Umhverfa
 Name[it]=Inverti
 Name[ja]=色調反転

effects/logout/package/metadata.desktop

@@ -15,6 +15,7 @@ Name[gl]=saír
 Name[he]=התנתקות
 Name[hu]=Kijelentkezés
 Name[ia]=Clausura de session
+Name[id]=logout
 Name[it]=uscita
 Name[ko]=로그아웃
 Name[nl]=afmelden