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

@@ -91,6 +91,7 @@
     "X-KDE-Keywords[ia]": "mobile,data,network",
     "X-KDE-Keywords[it]": "mobile,dati,rete",
     "X-KDE-Keywords[ka]": "mobile,data,network,მობილური ინტერნეტი,ქსელი",
+    "X-KDE-Keywords[lv]": "mobilie,dati,tīkls",
     "X-KDE-Keywords[nl]": "mobiel,gegevens,netwerk",
     "X-KDE-Keywords[nn]": "mobil,mobilt,data,nettverk",
     "X-KDE-Keywords[pl]": "komórkowa,mobilna,dane,sieć",

kcms/info/kcm_mobile_info.json

@@ -94,6 +94,7 @@
     "X-KDE-Keywords[ia]": "info, distro, system",
     "X-KDE-Keywords[it]": "info,distribuzione,sistema",
     "X-KDE-Keywords[ka]": "info, distro, system, ინფორმაცია, დისტრიბუტივი, სისტემა",
+    "X-KDE-Keywords[lv]": "informācija,distribūcija,sistēma",
     "X-KDE-Keywords[nl]": "informatie, distributie, systeem",
     "X-KDE-Keywords[nn]": "info, distro, distribusjon, system",
     "X-KDE-Keywords[pl]": "info, distro, system",

kcms/mobileshell/kcm_mobileshell.json

@@ -147,6 +147,7 @@
     "X-KDE-Keywords[it]": "sistema,shell,pannello",
     "X-KDE-Keywords[ka]": "system,shell,panel, სისტემა, გარემო, პანელი",
     "X-KDE-Keywords[ko]": "system,shell,panel,시스템,셸,패널",
+    "X-KDE-Keywords[lv]": "sistēma,čaula,panelis",
     "X-KDE-Keywords[nl]": "systeem,shell,paneel",
     "X-KDE-Keywords[nn]": "system,skal,shell,panel",
     "X-KDE-Keywords[pa]": "ਸਿਸਟਮ,ਸ਼ੈੱਲ,ਪੈਨਲ",

kcms/powermanagement/kcm_mobile_power.json

@@ -92,6 +92,7 @@
     "X-KDE-Keywords[ia]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
     "X-KDE-Keywords[it]": "video,monitor,grafica,timeout,sospensione,blocco,blocco dello schermo,salvaschermo",
     "X-KDE-Keywords[ka]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, ეკრანის შემნახველი, ვიდეო, ეკრანი, გრაფიკა, მოლოდინის დრო, ძილი",
+    "X-KDE-Keywords[lv]": "video, monitors, grafika, noildze, iesnaudināšana, slēgšana, ekrāna bloķēšana, bloķēt, ekrāna saudzētājs",
     "X-KDE-Keywords[nl]": "video, monitor, grafische elementen, timeout, slapen, vergrendeling, schermvergrendeling, schermbeveiliging",
     "X-KDE-Keywords[nn]": "video, skjerm, grafikk, tidsavbrot, timeout, sove, lås, låsing, skjermlåsar, pauseskjerm, skjermsparar",
     "X-KDE-Keywords[pl]": "video, monitor, grafika, timeout, uśpij, zablokuj, blokada ekranu, wygaszacz ekranu",

kcms/time/kcm_mobile_time.json

@@ -94,6 +94,7 @@
     "X-KDE-Keywords[ia]": "thema, semblantia, apparentia",
     "X-KDE-Keywords[it]": "tema, aspetto",
     "X-KDE-Keywords[ka]": "theme, look, feel, თემა, გარეგნობა",
+    "X-KDE-Keywords[lv]": "motīvs, izskats, uzvedība",
     "X-KDE-Keywords[nl]": "thema, uiterlijk, gedrag",
     "X-KDE-Keywords[nn]": "tema, utsjånad, åtferd",
     "X-KDE-Keywords[pl]": "wystrój, wygląd, odczucia, wrażenia",

kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json

@@ -133,6 +133,7 @@
     "X-KDE-Keywords[ia]": "onscreen,osk,virtualkeyboard,keyboard",
     "X-KDE-Keywords[it]": "onscreen,osk,tastiera virtuale,tastiera",
     "X-KDE-Keywords[ka]": "onscreen,osk,virtualkeyboard,keyboard,ეკრანზე, კლავიატურა ეკრანზე, კლავიატურა",
+    "X-KDE-Keywords[lv]": "ekrānā,osk,virtuālātastatūra,tastatūra",
     "X-KDE-Keywords[nl]": "op-scherm,osk,virtueel toetsenbord,toetsenbord",
     "X-KDE-Keywords[nn]": "skjermtastatur,virtuelt tastatur,tastatur",
     "X-KDE-Keywords[pl]": "klawiatura ekranowa,osk,klawiatura wirtualna,klawiatura",

kcms/wifi/kcm_mobile_wifi.json

@@ -98,6 +98,7 @@
     "X-KDE-Keywords[ia]": "wifi,network",
     "X-KDE-Keywords[it]": "wifi,rete",
     "X-KDE-Keywords[ka]": "wifi,network, ქსელი",
+    "X-KDE-Keywords[lv]": "wifi,tīkls",
     "X-KDE-Keywords[nl]": "wifi,netwerk",
     "X-KDE-Keywords[nn]": "wifi,nettverk,trådlaust",
     "X-KDE-Keywords[pl]": "wifi,sieć",