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

@@ -76,13 +76,17 @@
         "Name[zh_TW]": "行動網路"
     },
     "X-KDE-Keywords": "mobile,data,network",
+    "X-KDE-Keywords[ca@valencia]": "mòbil,dades,xarxa",
     "X-KDE-Keywords[ca]": "mòbil,dades,xarxa",
+    "X-KDE-Keywords[en_GB]": "mobile,data,network",
     "X-KDE-Keywords[gl]": "móbil,datos,rede",
     "X-KDE-Keywords[he]": "נייד,נתונים,רשת,פס רחב",
     "X-KDE-Keywords[ia]": "mobile,data,network",
+    "X-KDE-Keywords[it]": "mobile,dati,rete",
     "X-KDE-Keywords[ka]": "mobile,data,network,მობილური ინტერნეტი,ქსელი",
     "X-KDE-Keywords[sl]": "mobilnik,podatki,omrežje",
     "X-KDE-Keywords[sv]": "mobil,data,nätverk",
+    "X-KDE-Keywords[tr]": "mobil,cep,taşınabilir,veri,ağ",
     "X-KDE-Keywords[uk]": "mobile,data,network,мобільний,дані,мережа",
     "X-KDE-Keywords[x-test]": "xxmobilexx,xxdataxx,xxnetworkxx",
     "X-KDE-System-Settings-Parent-Category": "network",

kcms/info/kcm_mobile_info.json

@@ -79,13 +79,17 @@
         "Name[zh_TW]": "通知"
     },
     "X-KDE-Keywords": "info, distro, system",
+    "X-KDE-Keywords[ca@valencia]": "informació,distribució,sistema",
     "X-KDE-Keywords[ca]": "informació,distribució,sistema",
+    "X-KDE-Keywords[en_GB]": "info, distro, system",
     "X-KDE-Keywords[gl]": "info, información, distro, distribución, sistema",
     "X-KDE-Keywords[he]": "פרטים,מידע,הפצה,מערכת",
     "X-KDE-Keywords[ia]": "info, distro, system",
+    "X-KDE-Keywords[it]": "info,distribuzione,sistema",
     "X-KDE-Keywords[ka]": "info, distro, system, ინფორმაცია, დისტრიბუტივი, სისტემა",
     "X-KDE-Keywords[sl]": "informacije,distribucija,sistem",
     "X-KDE-Keywords[sv]": "information, distribution, system",
+    "X-KDE-Keywords[tr]": "bilgi,dağıtım,distro,sistem",
     "X-KDE-Keywords[uk]": "info, distro, system, інфо, відомості, дистрибутив, система",
     "X-KDE-Keywords[x-test]": "xxinfoxx,xx distroxx,xx systemxx",
     "X-KDE-System-Settings-Parent-Category": "system-administration"

kcms/mobileshell/kcm_mobileshell.json

@@ -132,6 +132,7 @@
     },
     "X-KDE-Keywords": "system,shell,panel",
     "X-KDE-Keywords[az]": "sistem,örtük,panel",
+    "X-KDE-Keywords[ca@valencia]": "sistema,intèrpret d'ordres,quadro",
     "X-KDE-Keywords[ca]": "sistema,intèrpret d'ordres,plafó",
     "X-KDE-Keywords[en_GB]": "system,shell,panel",
     "X-KDE-Keywords[es]": "sistema,intérprete,intérprete de órdenes,panel",
@@ -147,6 +148,7 @@
     "X-KDE-Keywords[ka]": "system,shell,panel, სისტემა, გარემო, პანელი",
     "X-KDE-Keywords[ko]": "system,shell,panel,시스템,셸,패널",
     "X-KDE-Keywords[nl]": "systeem,shell,paneel",
+    "X-KDE-Keywords[nn]": "system,skal,shell,panel",
     "X-KDE-Keywords[pa]": "ਸਿਸਟਮ,ਸ਼ੈੱਲ,ਪੈਨਲ",
     "X-KDE-Keywords[pt_BR]": "sistema,shell,painel",
     "X-KDE-Keywords[ro]": "sistem,interpretor,panou",

kcms/powermanagement/kcm_mobile_power.json

@@ -78,13 +78,17 @@
         "Name[zh_TW]": "電源"
     },
     "X-KDE-Keywords": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
+    "X-KDE-Keywords[ca@valencia]": "vídeo,monitor,gràfics,temps d'espera,dormir,bloqueig,bloqueig de pantalla,estil de pantalla",
     "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[gl]": "vídeo, monitor, gráficos, tempo límite, hibernar, bloquear, bloqueador de pantalla, salvapantallas",
     "X-KDE-Keywords[he]": "וידאו,צג,תצוגה,מסך,מקרן,גרפיקה,תום זמן,המתנה,השהיה,שינה,נעילה,נועל מסך,שומר מסך",
     "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[sl]": "video, monitor, grafika, časovna omejitev, spanje, zaklepanje, zaklepanje zaslona, ​​ohranjevalnik zaslona",
     "X-KDE-Keywords[sv]": "video, bildskärm, grafik, tidsgräns, viloläge, lår, skärmlåsning, skärmsläckare",
+    "X-KDE-Keywords[tr]": "video,monitör,ekran,görüntü,grafik,zaman aşımı,uyku,kilit,ekran kilidi,ekran koruyucusu",
     "X-KDE-Keywords[uk]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, відео, монітор, графіка, час очікування, присипляння, блокування, збереження, екран",
     "X-KDE-Keywords[x-test]": "xxvideoxx,xx monitorxx,xx graphicsxx,xx timeoutxx,xx sleepxx,xx lockxx,xx screenlockerxx,xx screensaverxx",
     "X-KDE-System-Settings-Parent-Category": "system-administration",

kcms/time/kcm_mobile_time.json

@@ -79,13 +79,17 @@
         "Name[zh_TW]": "時間與日期"
     },
     "X-KDE-Keywords": "theme, look, feel",
+    "X-KDE-Keywords[ca@valencia]": "tema,aspecte,comportament",
     "X-KDE-Keywords[ca]": "tema,aspecte,comportament",
+    "X-KDE-Keywords[en_GB]": "theme, look, feel",
     "X-KDE-Keywords[gl]": "tema, aparencia, estilo, comportamento",
     "X-KDE-Keywords[he]": "ערכת עיצוב,מראה,תחושה",
     "X-KDE-Keywords[ia]": "thema, semblantia, apparentia",
+    "X-KDE-Keywords[it]": "tema, aspetto",
     "X-KDE-Keywords[ka]": "theme, look, feel, თემა, გარეგნობა",
     "X-KDE-Keywords[sl]": "tema, videz, občutek",
     "X-KDE-Keywords[sv]": "tema, utseende, känsla",
+    "X-KDE-Keywords[tr]": "tema,görünüm,görünüş,his,bakış",
     "X-KDE-Keywords[uk]": "theme,look,feel,тема,вигляд,поведінка",
     "X-KDE-Keywords[x-test]": "xxthemexx,xx lookxx,xx feelxx",
     "X-KDE-System-Settings-Parent-Category": "regionalsettings",

kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json

@@ -119,13 +119,17 @@
         "Website": "https://plasma-mobile.org"
     },
     "X-KDE-Keywords": "onscreen,osk,virtualkeyboard,keyboard",
+    "X-KDE-Keywords[ca@valencia]": "en pantalla,osk,teclat virtual,teclat",
     "X-KDE-Keywords[ca]": "en pantalla,osk,teclat virtual,teclat",
+    "X-KDE-Keywords[en_GB]": "onscreen,osk,virtualkeyboard,keyboard",
     "X-KDE-Keywords[gl]": "onscreen,en pantalla,osk,virtualkeyboard,teclado virtual,keyboard,teclado",
     "X-KDE-Keywords[he]": "על המסך,מקלדת על המסך,מקלדת וירטואלית,מקלדת",
     "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[sl]": "na zaslonu,osk,virtualna tipkovnica,tipkovnica",
     "X-KDE-Keywords[sv]": "på skärmen,virtuellt tangentbord,tangentbord",
+    "X-KDE-Keywords[tr]": "ekran üzeri,ekran,osk,osd,sanal klavye,klavye,düğme",
     "X-KDE-Keywords[uk]": "onscreen,osk,virtualkeyboard,keyboard,екранна,екран,клавіатура",
     "X-KDE-Keywords[x-test]": "xxonscreenxx,xxoskxx,xxvirtualkeyboardxx,xxkeyboardxx",
     "X-KDE-System-Settings-Parent-Category": "input-devices"

kcms/wifi/kcm_mobile_wifi.json

@@ -84,13 +84,17 @@
         "Name[zh_TW]": "Wi-Fi"
     },
     "X-KDE-Keywords": "wifi,network",
+    "X-KDE-Keywords[ca@valencia]": "wi-fi,xarxa",
     "X-KDE-Keywords[ca]": "wi-fi,xarxa",
+    "X-KDE-Keywords[en_GB]": "wifi,network",
     "X-KDE-Keywords[gl]": "sen fíos,wifi,rede",
     "X-KDE-Keywords[he]": "רשת אלחוטית,רשת,תקשורת",
     "X-KDE-Keywords[ia]": "wifi,network",
+    "X-KDE-Keywords[it]": "wifi,rete",
     "X-KDE-Keywords[ka]": "wifi,network, ქსელი",
     "X-KDE-Keywords[sl]": "wifi,omrežje",
     "X-KDE-Keywords[sv]": "wifi,nätverk",
+    "X-KDE-Keywords[tr]": "wifi,wi-fi,ağ",
     "X-KDE-Keywords[uk]": "wifi,network,вайфай,мережа",
     "X-KDE-Keywords[x-test]": "xxwifixx,xxnetworkxx",
     "X-KDE-System-Settings-Parent-Category": "network",