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"

applets/systemtray/container/package/metadata.desktop

@@ -38,7 +38,7 @@ Name[hr]=Sistemski blok
 Name[hsb]=Systemowa wotkładka
 Name[hu]=Paneltálca
 Name[ia]=Tabuliero de systema
-Name[id]=Baki Sistem
+Name[id]=System Tray
 Name[is]=Kerfisbakki
 Name[it]=Vassoio di sistema
 Name[ja]=システムトレイ

applets/systemtray/package/metadata.desktop

@@ -38,7 +38,7 @@ Name[hr]=Sistemski blok
 Name[hsb]=Systemowa wotkładka
 Name[hu]=Paneltálca
 Name[ia]=Tabuliero de systema
-Name[id]=Baki Sistem
+Name[id]=System Tray
 Name[is]=Kerfisbakki
 Name[it]=Vassoio di sistema
 Name[ja]=システムトレイ

dataengines/devicenotifications/devicenotifications.notifyrc

@@ -80,10 +80,12 @@ IconName=device-notifier
 Name=Device Status
 Name[az]=Qurğuların statusu
 Name[ca]=Estat del dispositiu
+Name[en_GB]=Device Status
 Name[es]=Estado del dispositivo
 Name[it]=Stato dei dispositivi
 Name[nl]=Apparaatstatus
 Name[nn]=Einingsstatus
+Name[pl]=Stan urządzenia
 Name[pt]=Estado do Dispositivo
 Name[pt_BR]=Status do dispositivo
 Name[ru]=Состояние устройства