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

@@ -20,7 +20,7 @@
         "Description[it]": "Gestione delle reti cellulari",
         "Description[ka]": "ფიჭური ქსელების მართვა",
         "Description[ko]": "모바일 네트워크 관리",
-        "Description[lv]": "Mobilo tīklu pārvaldība",
+        "Description[lv]": "Pārvaldīt mobilos tīklus",
         "Description[nl]": "Beheer van cellulaire netwerken",
         "Description[nn]": "Handsaming av mobilnettverk",
         "Description[pa]": "ਸੈਲੂਲਰ ਨੈੱਟਵਰਕਾਂ ਦਾ ਇੰਤਜ਼ਾਮ",

kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json

@@ -61,7 +61,7 @@
         "Description[it]": "Configurazione della tastiera su schermo",
         "Description[ka]": "კლავიატურის კრანზე მორგება",
         "Description[ko]": "가상 키보드 설정",
-        "Description[lv]": "Ekrāna tastatūras konfigurēšana",
+        "Description[lv]": "Konfigurēt ekrāna tastatūru",
         "Description[nl]": "Configuratie van toetsenbord op het scherm",
         "Description[nn]": "Oppsett av skjermtastatur",
         "Description[pa]": "ਆਨ-ਸਕਰੀਨ ਕੀਬੋਰਡ ਸੰਰਚਨਾ",