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"

data/pictures/default.desktop

@@ -14,6 +14,7 @@ Name[fr]=Défaut pour Bataille Navale
 Name[ga]=Comhrac Cabhlaigh Réamhshocraithe
 Name[gl]=Predeterminado de Batalla Naval
 Name[hu]=Tengeri csata alapértelmezett
+Name[id]=Naval Battle Default
 Name[it]=Predefinito di Battaglia navale
 Name[kk]=Теңіз соғысының әдеттегісі
 Name[ko]=전함 대전 기본
@@ -54,6 +55,7 @@ Description[fi]=Meritaistelun oletusteema
 Description[fr]=Le thème par défaut pour Bataille Navale
 Description[gl]=Tema predeterminado para Batalla Naval.
 Description[hu]=Alapértelmezett téma a Tengeri csatához
+Description[id]=Tema baku untuk Naval Battle
 Description[it]=Il tema predefinito di Battaglia navale
 Description[kk]=Теңіз соғысының әдеттегі нақышы
 Description[ko]=전함 대전 기본 테마

src/knavalbattle.protocol

@@ -20,6 +20,7 @@ Description[fr]=Un protocole pour le jeu de Bataille Navale
 Description[ga]=Prótacal le haghaidh an chluiche Naval Battle
 Description[gl]=Protocolo para o xogo Batalla Naval.
 Description[hu]=Protokoll a Tengeri csata játékhoz
+Description[id]=Sebuah protokol untuk permainan Naval Battle
 Description[it]=Un protocollo per Battaglia navale
 Description[kk]=Теңіздегі соғыс ойынның протоколы
 Description[km]=ពិធីការ​សម្រាប់​ល្បែង​ នាវាចំបាំង

src/org.kde.knavalbattle.desktop

@@ -14,6 +14,7 @@ Name[fr]=Bataille navale
 Name[ga]=Comhrac Cabhlaigh
 Name[gl]=Batalla Naval
 Name[hu]=Tengeri csata
+Name[id]=Naval Battle
 Name[it]=Battaglia navale
 Name[kk]=Теңіз соғысы
 Name[km]=ចម្បាំង​តាម​នាវា
@@ -63,6 +64,7 @@ GenericName[fr]=Jeu de touché-coulé
 GenericName[ga]=Cluiche Comhraic Chabhlaigh
 GenericName[gl]=Xogo de afundir barcos.
 GenericName[hu]=Hajóelsüllyesztő játék
+GenericName[id]=Permainan Kapal Selam
 GenericName[it]=Gioco di affondamento navi
 GenericName[kk]=Теңіздегі соғыс ойны
 GenericName[km]=ល្បែង​ពន្លិច​កប៉ាល់