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/batterymonitor/package/metadata.desktop

@@ -125,7 +125,7 @@ Keywords[el]=Διαχείριση ισχύος;Μπαταρία;Σύστημα;
 Keywords[en_GB]=Power Management;Battery;System;Energy;
 Keywords[es]=Gestión de energía;Batería;Sistema;Energía;
 Keywords[et]=Toitehaldus;aku;süsteem;energia;
-Keywords[eu]=Energia kudeaketa;bateria;sistema,energia;
+Keywords[eu]=energia kudeaketa;bateria;sistema;energia;
 Keywords[fi]=Virranhallinta;Akku;Järjestelmä;Virransäästö;
 Keywords[fr]=Gestion de l'énergie;Batterie;Système;Énergie;
 Keywords[gl]=Xestión da enerxía;batería;sistema;enerxía;