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"

kcms/cellularnetwork/kcm_cellular_network.json

@@ -83,6 +83,7 @@
     "X-KDE-Keywords[cs]": "mobilní,data,síť",
     "X-KDE-Keywords[en_GB]": "mobile,data,network",
     "X-KDE-Keywords[es]": "móvil,datos,red",
+    "X-KDE-Keywords[eu]": "mugikorra,telefono mugikorra,datuak,sarea",
     "X-KDE-Keywords[fr]": "mobile, data, réseau",
     "X-KDE-Keywords[gl]": "móbil,datos,rede",
     "X-KDE-Keywords[he]": "נייד,נתונים,רשת,פס רחב",

kcms/info/kcm_mobile_info.json

@@ -86,6 +86,7 @@
     "X-KDE-Keywords[cs]": "informace, distribuce, systém",
     "X-KDE-Keywords[en_GB]": "info, distro, system",
     "X-KDE-Keywords[es]": "información,distribución,sistema",
+    "X-KDE-Keywords[eu]": "info,informazioa,distro,banaketa,sistema",
     "X-KDE-Keywords[fr]": "info, distribution, système",
     "X-KDE-Keywords[gl]": "info, información, distro, distribución, sistema",
     "X-KDE-Keywords[he]": "פרטים,מידע,הפצה,מערכת",

kcms/powermanagement/kcm_mobile_power.json

@@ -84,6 +84,7 @@
     "X-KDE-Keywords[ca]": "vídeo,monitor,gràfics,temps d'espera,dormir,bloqueig,bloqueig de pantalla,estil de pantalla",
     "X-KDE-Keywords[en_GB]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
     "X-KDE-Keywords[es]": "vídeo,monitor,gráficos,tiempo de espera,reposo,bloqueo,bloqueo de la pantalla,salvapantallas",
+    "X-KDE-Keywords[eu]": "bideoa, monitorea, grafikoak, denbora-muga, lo, lokartu, giltzatu, pantaila-giltzatzailea, pantaila-babeslea",
     "X-KDE-Keywords[fr]": "vidéo, moniteur, graphique, délai d'attente, veille, verrouillage, bloqueur d'écran, économiseur d'écran",
     "X-KDE-Keywords[gl]": "vídeo, monitor, gráficos, tempo límite, hibernar, bloquear, bloqueador de pantalla, salvapantallas",
     "X-KDE-Keywords[he]": "וידאו,צג,תצוגה,מסך,מקרן,גרפיקה,תום זמן,המתנה,השהיה,שינה,נעילה,נועל מסך,שומר מסך",

kcms/time/kcm_mobile_time.json

@@ -86,6 +86,7 @@
     "X-KDE-Keywords[cs]": "motiv,vzhled,chování",
     "X-KDE-Keywords[en_GB]": "theme, look, feel",
     "X-KDE-Keywords[es]": "tema,aspecto",
+    "X-KDE-Keywords[eu]": "gaia, itxura, izaera",
     "X-KDE-Keywords[fr]": "thème, apparence, sensation",
     "X-KDE-Keywords[gl]": "tema, aparencia, estilo, comportamento",
     "X-KDE-Keywords[he]": "ערכת עיצוב,מראה,תחושה",

kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json

@@ -125,6 +125,7 @@
     "X-KDE-Keywords[ca]": "en pantalla,osk,teclat virtual,teclat",
     "X-KDE-Keywords[en_GB]": "onscreen,osk,virtualkeyboard,keyboard",
     "X-KDE-Keywords[es]": "en pantalla,osk,teclado virtual,teclado",
+    "X-KDE-Keywords[eu]": "pantailako,osk,alegiazko teklatua,teklatu birtuala,teklatua",
     "X-KDE-Keywords[fr]": "à l'écran, incrustation vidéo, clavier virtuel, clavier",
     "X-KDE-Keywords[gl]": "onscreen,en pantalla,osk,virtualkeyboard,teclado virtual,keyboard,teclado",
     "X-KDE-Keywords[he]": "על המסך,מקלדת על המסך,מקלדת וירטואלית,מקלדת",

kcms/wifi/kcm_mobile_wifi.json

@@ -90,6 +90,7 @@
     "X-KDE-Keywords[cs]": "wifi,síť",
     "X-KDE-Keywords[en_GB]": "wifi,network",
     "X-KDE-Keywords[es]": "wifi,red",
+    "X-KDE-Keywords[eu]": "wifi,sarea",
     "X-KDE-Keywords[fr]": "wifi, réseau",
     "X-KDE-Keywords[gl]": "sen fíos,wifi,rede",
     "X-KDE-Keywords[he]": "רשת אלחוטית,רשת,תקשורת",