From 9799f8c95ef46dbcf3999fdad69847f9a080dcfd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 25 Oct 2018 07:54:05 +0200
Subject: [PATCH 1/9] 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"
---
 dataengines/hotplug/plasma-dataengine-hotplug.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dataengines/hotplug/plasma-dataengine-hotplug.desktop b/dataengines/hotplug/plasma-dataengine-hotplug.desktop
index 08bf23bea..2f0c2ebbf 100644
--- a/dataengines/hotplug/plasma-dataengine-hotplug.desktop
+++ b/dataengines/hotplug/plasma-dataengine-hotplug.desktop
@@ -27,7 +27,7 @@ Name[hne]=हाटप्लग घटना
 Name[hr]=Događaji brzog uštekavanja
 Name[hu]=Eszközcsatolást kezelő plazmoid
 Name[ia]=Eventos de hotplug
-Name[id]=Perihal Hotplug
+Name[id]=Hotplug Events
 Name[is]=Hraðtengingaatburðir
 Name[it]=Eventi di collegamento a caldo
 Name[ja]=Hotplug イベント
@@ -88,7 +88,7 @@ Comment[he]=משמש למעקב אחר התקנים נשלפים בעת חיבו
 Comment[hr]=Pratite uređaje za brzo uštekavanje kako se pojavljuju i nestaju
 Comment[hu]=Követi a menet közben csatolható (hot-pluggable) eszközöket.
 Comment[ia]=Il tracia dispositivos hot-pluggable (insertabile a calide) assi como illos appare e disappare
-Comment[id]=Lacak perangkat dapat dihot-plug ketika mereka muncul atau menghilang.
+Comment[id]=Lacak perangkat yang dapat dicabut-colok ketika mereka muncul atau menghilang.
 Comment[is]=Fylgist með hraðtengdum tækjum um leið og þau birtast eða hverfa.
 Comment[it]=Sorveglia il collegamento e lo scollegamento dei dispositivi collegabili mentre il sistema è in funzione.
 Comment[ja]=ホットプラグ可能なデバイスが抜き差しされるのを捕捉します。

From 703f837f6b0584790ef7a132f217b7d64b543988 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 28 Oct 2018 07:03:51 +0100
Subject: [PATCH 2/9] 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/clipboard/metadata.desktop                            | 2 +-
 applets/digital-clock/package/metadata.desktop                | 2 +-
 applets/notifications/package/metadata.desktop                | 2 +-
 .../contextmenu/plasma-containmentactions-contextmenu.desktop | 2 +-
 .../applicationjobs/plasma-dataengine-applicationjobs.desktop | 2 +-
 dataengines/apps/plasma-dataengine-apps.desktop               | 2 +-
 dataengines/hotplug/plasma-dataengine-hotplug.desktop         | 2 +-
 dataengines/mouse/plasma-dataengine-mouse.desktop             | 2 +-
 dataengines/mpris2/plasma-dataengine-mpris2.desktop           | 2 +-
 dataengines/places/plasma-dataengine-places.desktop           | 2 +-
 dataengines/share/backends/kde/metadata.desktop               | 2 +-
 dataengines/soliddevice/plasma-dataengine-soliddevice.desktop | 4 ++--
 freespacenotifier/freespacenotifier.desktop                   | 2 +-
 kioslave/desktop/desktopnotifier.desktop                      | 2 +-
 klipper/klipperrc.desktop                                     | 4 ++--
 ktimezoned/ktimezoned.desktop                                 | 2 +-
 menu/desktop/kf5-utilities-xutils.directory                   | 2 +-
 phonon/platform_kde/phonon.notifyrc                           | 2 +-
 runners/activities/plasma-runner-activityrunner.desktop       | 2 +-
 runners/baloo/plasma-runner-baloosearch.desktop               | 2 +-
 runners/bookmarks/plasma-runner-bookmarks.desktop             | 2 +-
 runners/calculator/plasma-runner-calculator.desktop           | 2 +-
 runners/locations/plasma-runner-locations.desktop             | 2 +-
 runners/places/plasma-runner-places.desktop                   | 2 +-
 runners/sessions/plasma-runner-sessions.desktop               | 2 +-
 runners/shell/plasma-runner-shell.desktop                     | 2 +-
 runners/solid/plasma-runner-solid.desktop                     | 2 +-
 runners/windowedwidgets/plasma-runner-windowedwidgets.desktop | 2 +-
 runners/windows/plasma-runner-windows.desktop                 | 2 +-
 .../shell/plasma-packagestructure-plasma-shell.desktop        | 2 +-
 solidautoeject/solidautoeject.desktop                         | 2 +-
 statusnotifierwatcher/statusnotifierwatcher.desktop           | 2 +-
 systemmonitor/ksysguard.desktop                               | 4 ++--
 wallpapers/color/plasma-wallpaper-color.desktop               | 2 +-
 34 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/applets/clipboard/metadata.desktop b/applets/clipboard/metadata.desktop
index 5f2b6d00e..9aa250c9c 100644
--- a/applets/clipboard/metadata.desktop
+++ b/applets/clipboard/metadata.desktop
@@ -60,7 +60,7 @@ Comment[fr]=Donne accès à l'historique du presse-papiers
 Comment[gl]=Fornece acceso ao historial do portapapeis.
 Comment[hu]=Hozzáférést nyújt a vágólap előzményeihez
 Comment[id]=Menyediakan akses ke riwayat clipboard
-Comment[it]=Fornisce l'accesso allo storico degli appunti
+Comment[it]=Fornisce l'accesso alla cronologia degli appunti
 Comment[ko]=클립보드 기록 표시
 Comment[nl]=Biedt toegang tot de geschiedenis van klembord
 Comment[nn]=Gjev tilgang til utklippstavleloggen
diff --git a/applets/digital-clock/package/metadata.desktop b/applets/digital-clock/package/metadata.desktop
index d4e4d297c..59a4e0831 100644
--- a/applets/digital-clock/package/metadata.desktop
+++ b/applets/digital-clock/package/metadata.desktop
@@ -105,7 +105,7 @@ Comment[he]=השעה מוצגת בפורמט דיגיטלי
 Comment[hu]=Digitális formában kijelzett idő
 Comment[id]=Waktu ditampilkan dalam format digital
 Comment[is]=Klukkan sýnd á stafrænu formi
-Comment[it]=Ora indicata in formato digitale
+Comment[it]=Ora visualizzata in formato digitale
 Comment[ja]=デジタル形式で表示される時刻
 Comment[ko]=디지털 시계
 Comment[lt]=Laikas rodomas skaitmeniniu formatu
diff --git a/applets/notifications/package/metadata.desktop b/applets/notifications/package/metadata.desktop
index 1c4afe862..4897beac7 100644
--- a/applets/notifications/package/metadata.desktop
+++ b/applets/notifications/package/metadata.desktop
@@ -108,7 +108,7 @@ Comment[hu]=Értesítések és feladatok megjelenítése
 Comment[ia]=Monstra notificationes e labores
 Comment[id]=Tampilan notifikasi dan tugas
 Comment[is]=Birting tilkynninga og verka
-Comment[it]=Mostra notifiche e processi
+Comment[it]=Visualizza le notifiche ed i processi
 Comment[ja]=ディスプレイ通知とジョブ
 Comment[kk]=Құлақтандыру мен тапсырмаларды көрсету
 Comment[km]=បង្ហាញ​ការ​ជូនដំណឹង និង​ការងារ
diff --git a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
index 33ffc1078..2d9d60afe 100644
--- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
@@ -93,7 +93,7 @@ Comment[hu]=A jobb egérkattintásra megjelenő menü
 Comment[ia]=Le menu que normalmente monstra se sur le pression dextere
 Comment[id]=Menu yang biasanya tampil saat klik-kanan
 Comment[is]=Valmyndin sem kemur venjulega upp við hægrismell
-Comment[it]=Il menu che normalmente appare su clic destro
+Comment[it]=Il menu che normalmente appare al clic destro
 Comment[ja]=通常は右クリックで表示されるメニュー
 Comment[kk]=Оң жақ түртімде шыға келетін кәдімгі мәзір
 Comment[km]=ម៉ឺនុយ​ដែល​តាម​ធម្មតា​បង្ហាញ​នៅ​ពេល​ចុច​កណ្ដុរ​ស្ដាំ
diff --git a/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop b/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
index d325a322f..ec1e5df51 100644
--- a/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
+++ b/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
@@ -94,7 +94,7 @@ Comment[hu]=Feladatfrissítő (a kuiserveren keresztül)
 Comment[ia]=Actualisationes de travalio de application (via kuiserver)
 Comment[id]=Tugas aplikasi diupdate (via kuiserver)
 Comment[is]=Uppfærslutilkynningar um verkefni forrita (með kuiserver)
-Comment[it]=Aggiornamenti sui processi delle applicazioni (via kuiserver)
+Comment[it]=Aggiornamenti sui processi delle applicazioni (con kuiserver)
 Comment[ja]=アプリケーションジョブ更新 (kuiserver 経由)
 Comment[kk]=Қолданба тапсырмасын жаңарту (kuiserver арқылы)
 Comment[km]=បច្ចុប្បន្នភាព​​ការងារ​របស់​កម្មវិធី (តាមរយៈ kuiserver)
diff --git a/dataengines/apps/plasma-dataengine-apps.desktop b/dataengines/apps/plasma-dataengine-apps.desktop
index 8f9b8bbaa..8bff86d64 100644
--- a/dataengines/apps/plasma-dataengine-apps.desktop
+++ b/dataengines/apps/plasma-dataengine-apps.desktop
@@ -28,7 +28,7 @@ Name[hu]=Az alkalmazások jellemzői
 Name[ia]=Information de application
 Name[id]=Informasi Aplikasi
 Name[is]=Upplýsingar um forrit
-Name[it]=Informazioni sulle applicazioni
+Name[it]=Informazioni sull'applicazione
 Name[ja]=アプリケーションの情報
 Name[kk]=Қолданбаның ақпараты
 Name[km]=ព័ត៌មាន​កម្មវិធី
diff --git a/dataengines/hotplug/plasma-dataengine-hotplug.desktop b/dataengines/hotplug/plasma-dataengine-hotplug.desktop
index 2f0c2ebbf..d14bc155f 100644
--- a/dataengines/hotplug/plasma-dataengine-hotplug.desktop
+++ b/dataengines/hotplug/plasma-dataengine-hotplug.desktop
@@ -90,7 +90,7 @@ Comment[hu]=Követi a menet közben csatolható (hot-pluggable) eszközöket.
 Comment[ia]=Il tracia dispositivos hot-pluggable (insertabile a calide) assi como illos appare e disappare
 Comment[id]=Lacak perangkat yang dapat dicabut-colok ketika mereka muncul atau menghilang.
 Comment[is]=Fylgist með hraðtengdum tækjum um leið og þau birtast eða hverfa.
-Comment[it]=Sorveglia il collegamento e lo scollegamento dei dispositivi collegabili mentre il sistema è in funzione.
+Comment[it]=Sorveglia i dispositivi rimuovibili a caldo quando appaiono o scompaiono.
 Comment[ja]=ホットプラグ可能なデバイスが抜き差しされるのを捕捉します。
 Comment[kk]=Істеп турғанда қосылатын құрылғылардың қосылғанын/ажыратылғанын бақылау.
 Comment[km]=តាមដាន​ឧបករណ៍​ដែល​អាច​ដោត​ដើរ​ដូច​ពួកវា​បង្ហាញ និង​មិន​បង្ហាញ ។
diff --git a/dataengines/mouse/plasma-dataengine-mouse.desktop b/dataengines/mouse/plasma-dataengine-mouse.desktop
index a48fe942b..4ff2a25ae 100644
--- a/dataengines/mouse/plasma-dataengine-mouse.desktop
+++ b/dataengines/mouse/plasma-dataengine-mouse.desktop
@@ -97,7 +97,7 @@ Comment[hu]=Egérmutató-pozíció
 Comment[ia]=Position e cursor del mus
 Comment[id]=Posisi mouse dan kursor
 Comment[is]=Staðsetning músar og bendils
-Comment[it]=Posizione e cursore del mouse
+Comment[it]=Posizione e puntatore del mouse
 Comment[ja]=マウスの位置とカーソル
 Comment[kk]=Тышқанның орны және меңзері
 Comment[km]=ទីតាំង និង​ទស្សន៍ទ្រនិច្ច​កណ្ដុរ
diff --git a/dataengines/mpris2/plasma-dataengine-mpris2.desktop b/dataengines/mpris2/plasma-dataengine-mpris2.desktop
index 777dd98a6..6ea165c41 100644
--- a/dataengines/mpris2/plasma-dataengine-mpris2.desktop
+++ b/dataengines/mpris2/plasma-dataengine-mpris2.desktop
@@ -68,7 +68,7 @@ Comment[hu]=Információkat szolgáltat és vezérli a médialejátszókat az MP
 Comment[ia]=Il provide information ex e control super media players via MPRIS2
 Comment[id]=Menyediakan informasi dari dan kendali player media via MPRIS2
 Comment[is]=Stýrir og gefur upplýsingar um margmiðlunarspilara með MPRIS2
-Comment[it]=Fornisce le informazioni da e controlla lettori multimediali via MPRIS2
+Comment[it]=Fornisce le informazioni dai lettori multimediali e li controlla con MPRIS2
 Comment[ja]=MPRIS2 を通して、メディアプレーヤーからの情報を提供し、メディアプレーヤーを制御します
 Comment[kk]=MPRIS2 арқылы медиаплейер мәліметін алып оны басқару мүмкіндігі
 Comment[km]=ផ្ដល់​ព័ត៌មាន​ពី និង​ត្រួតពិនិត្យ​លើ​កម្មវិធី​ចាក់​មេឌៀ​តាមរយៈ MPRIS2
diff --git a/dataengines/places/plasma-dataengine-places.desktop b/dataengines/places/plasma-dataengine-places.desktop
index 712fa0068..41d6d99f7 100644
--- a/dataengines/places/plasma-dataengine-places.desktop
+++ b/dataengines/places/plasma-dataengine-places.desktop
@@ -99,7 +99,7 @@ Comment[hu]=Helyek panel (ahogy a fájlkezelőben és a fájlmegnyitó ablakokba
 Comment[ia]=Placias, tal como vidite in le gerente de file e in le dialogos de file
 Comment[id]=Tempat, seperti terlihat di pengelola file dan di dialog file.
 Comment[is]=Staðir, eins og sýnt er í skráastjóra og samskiptagluggum.
-Comment[it]=Risorse, come nel gestore dei file e nelle finestre di selezione dei file.
+Comment[it]=Risorse, come si vedono nel gestore dei file e nelle finestre di selezione dei file.
 Comment[ja]=ファイルマネージャやファイル選択ダイアログに表示される場所
 Comment[kk]=Файл менеджерде және диалогында көрсетілетін орындар.
 Comment[km]=កន្លែង ដូច​ដែល​បានឃើញ​នៅ​ក្នុង​កម្មវិធី​គ្រប់គ្រង​ឯកសារ និង​ប្រអប់​ឯកសារ ។
diff --git a/dataengines/share/backends/kde/metadata.desktop b/dataengines/share/backends/kde/metadata.desktop
index d39ba1973..b056c9f7f 100644
--- a/dataengines/share/backends/kde/metadata.desktop
+++ b/dataengines/share/backends/kde/metadata.desktop
@@ -70,7 +70,7 @@ Comment[hu]=Szöveg megosztása a kde.org szolgáltatás használatával
 Comment[ia]=Il permitte texto de esser compartite per usar le servicio kde.org
 Comment[id]=Memungkinkan teks dibagi menggunakan layanan kde.org
 Comment[is]=Gerir kleift að deila texta með kde.org límklippusafninu
-Comment[it]=Abilita la condivisione di immagini con il servizio kde.org
+Comment[it]=Abilita la condivisione di testo con il servizio kde.org
 Comment[ja]=kde.org のサービスを用いたテキストの共有を有効にする
 Comment[kk]=kde.org қызметі көмегімен мәтінді ортақ қылуды рұқсат ету
 Comment[km]=បើក​ការ​ចែករំលែក​អត្ថបទ​ដោយ​ប្រើ​សេវា  kde.org
diff --git a/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop b/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop
index 8e05f110f..f6152b745 100644
--- a/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop
+++ b/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop
@@ -32,7 +32,7 @@ Name[hu]=Eszközjellemzők
 Name[ia]=Information de dispositivo
 Name[id]=Informasi Perangkat
 Name[is]=Upplýsingar tækis
-Name[it]=Informazioni sui dispositivi
+Name[it]=Informazioni sul dispositivo
 Name[ja]=デバイス情報
 Name[kk]=Құрылғы мәліметі
 Name[km]=ព័ត៌មាន​ឧបករណ៍
@@ -102,7 +102,7 @@ Comment[hu]=Eszközjellemzők a Solid alrendszerből
 Comment[ia]=Datos de dispositivos via Solid
 Comment[id]=Data perangkat via Solid
 Comment[is]=Vélbúnaðarupplýsingar með Solid
-Comment[it]=Dati sui dispositivi con Solid
+Comment[it]=Dati sul dispositivo con Solid
 Comment[ja]=Solid によるデバイスデータ
 Comment[kk]=Solid құрылғы деректері
 Comment[km]=ទិន្នន័យ​ឧបករណ៍តាម​រយៈ Solid​
diff --git a/freespacenotifier/freespacenotifier.desktop b/freespacenotifier/freespacenotifier.desktop
index 643eb5777..33009105b 100644
--- a/freespacenotifier/freespacenotifier.desktop
+++ b/freespacenotifier/freespacenotifier.desktop
@@ -91,7 +91,7 @@ Comment[hu]=Figyelmeztet, ha kezd elfogyni a szabad lemezterület a saját köny
 Comment[ia]=Il avisa quando il termina le spatio sur tu dossier domo
 Comment[id]=Memperingatkan jika kehabisan ruang kosong di folder rumah anda
 Comment[is]=Varar við þegar lítið pláss er eftir í heimamöppunni þinni
-Comment[it]=Avvisa quando si sta esaurendo lo spazio nella tua cartella Home
+Comment[it]=Avvisa quando lo spazio nella tua cartella Home si sta esaurendo
 Comment[ja]=ホームフォルダの空き領域が少なくなったとき警告します
 Comment[kk]=Мекен қапшығыңызда орын тапшылығы туралы ескерту
 Comment[km]=ព្រមាន នៅពេល​ដំណើរការ​អស់ទំហំ​នៅ​លើ​ក្នុង​​ផ្ទះ​របស់​អ្នក
diff --git a/kioslave/desktop/desktopnotifier.desktop b/kioslave/desktop/desktopnotifier.desktop
index 9b0af7bbe..e4cb3a73d 100644
--- a/kioslave/desktop/desktopnotifier.desktop
+++ b/kioslave/desktop/desktopnotifier.desktop
@@ -18,7 +18,7 @@ Name[he]=צופה תיקיות
 Name[hu]=Mappafigyelő
 Name[id]=Pengintai Direktori
 Name[is]=Möppuskoðunartól
-Name[it]=Guardia delle cartelle
+Name[it]=Sorveglianza delle cartelle
 Name[ja]=ディレクトリウォッチャ
 Name[ko]=디렉터리 감시기
 Name[lt]=Aplanko stebėtojas
diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop
index 4279b1450..0453584a8 100644
--- a/klipper/klipperrc.desktop
+++ b/klipper/klipperrc.desktop
@@ -315,7 +315,7 @@ Description[hu]=Megnyitás az &alapértelmezett böngészővel
 Description[ia]=Aperi con navigator pre&definite
 Description[id]=Buka &dengan Penelusur baku
 Description[is]=Opna með sjálf&gefnum vefskoðara
-Description[it]=Apri con browser pre&definito
+Description[it]=Apri con il browser pre&definito
 Description[ja]=デフォルトのブラウザで開く(&D)
 Description[kk]=Ә&детті шолғышында ашу
 Description[km]=បើក​ជាមួយ​កម្មវិធី​រុករក​លំនាំដើម
@@ -1981,7 +1981,7 @@ Description[hu]=Megnyitás az &alapértelmezett böngészővel
 Description[ia]=Aperi con navigator pre&definite
 Description[id]=Buka &dengan Penelusur baku
 Description[is]=Opna með sjálf&gefnum vefskoðara
-Description[it]=Apri con browser pre&definito
+Description[it]=Apri con il browser pre&definito
 Description[ja]=デフォルトのブラウザで開く(&D)
 Description[kk]=Ә&детті шолғышында ашу
 Description[km]=បើក​ជាមួយ​កម្មវិធី​រុករក​លំនាំដើម
diff --git a/ktimezoned/ktimezoned.desktop b/ktimezoned/ktimezoned.desktop
index e635aaebb..6756d4ede 100644
--- a/ktimezoned/ktimezoned.desktop
+++ b/ktimezoned/ktimezoned.desktop
@@ -103,7 +103,7 @@ Comment[hu]=A rendszer időzónájának biztosítása alkalmazásokhoz
 Comment[ia]=Il forni le fuso horari de systema al applicationes
 Comment[id]=Menyediakan zona waktu sistem untuk aplikasi
 Comment[is]=Sér forritum fyrir stillingum á tímabelti kerfisins
-Comment[it]=Dà il fuso orario di sistema alle applicazioni
+Comment[it]=Fornisce il fuso orario di sistema alle applicazioni
 Comment[ja]=アプリケーションにシステムのタイムゾーンを提供します
 Comment[kk]=Қолданбаларға орнатылған уақыт белдеу мәліметін жеткізеді
 Comment[km]=ផ្ដល់​តំបន់​ពេលវេលា​​ប្រព័ន្ធ​ឲ្យ​​កម្មវិធី
diff --git a/menu/desktop/kf5-utilities-xutils.directory b/menu/desktop/kf5-utilities-xutils.directory
index cac20cdb7..d5cb823f2 100644
--- a/menu/desktop/kf5-utilities-xutils.directory
+++ b/menu/desktop/kf5-utilities-xutils.directory
@@ -88,7 +88,7 @@ Comment[hu]=X Window segédprogramok
 Comment[ia]=Utilitates de X Window
 Comment[id]=Utilitas Jendela X
 Comment[is]=X gluggatól
-Comment[it]=Programmi di X Window
+Comment[it]=Accessori di X Window
 Comment[ja]=X ウィンドウユーティリティ
 Comment[ka]=X Window–ს ხელსაწყოები
 Comment[kk]=X Window утилиталары
diff --git a/phonon/platform_kde/phonon.notifyrc b/phonon/platform_kde/phonon.notifyrc
index a69e7882e..f1248efea 100644
--- a/phonon/platform_kde/phonon.notifyrc
+++ b/phonon/platform_kde/phonon.notifyrc
@@ -210,7 +210,7 @@ Comment[hu]=Értesítés a hangkimeneti eszköz automatikus megváltozásakor
 Comment[ia]=Notification quando un dispositivo de egresso de sono ha modificate automaticamente
 Comment[id]=Notifikasi ketika perangkat output audio telah berubah secara otomatis
 Comment[is]=Tilkynning þegar skipt hefur verið sjálfvirkt um úttakstæki fyrir hljóð
-Comment[it]=Notifica di quando il dispositivo di uscita audio è stato cambiato automaticamente
+Comment[it]=Notifica di quando il dispositivo di uscita audio viene cambiato automaticamente
 Comment[ja]=オーディオ出力デバイスが自動的に変更された時の通知
 Comment[kk]=Аудио шығыс құрылғысы автоматты түрде  өзгергенде құлақтандыру
 Comment[km]=ជូន​ដំណឹង នៅ​ពេល​ឧបករណ៍​បញ្ចេញ​អូឌីយ៉ូ​បាន​ផ្លាស់ប្ដូរ​ដោយ​ស្វ័យ​ប្រវត្តិ
diff --git a/runners/activities/plasma-runner-activityrunner.desktop b/runners/activities/plasma-runner-activityrunner.desktop
index 6974c565f..169726279 100644
--- a/runners/activities/plasma-runner-activityrunner.desktop
+++ b/runners/activities/plasma-runner-activityrunner.desktop
@@ -80,7 +80,7 @@ Comment[hu]=Asztali aktivitások listázása és váltás közöttük
 Comment[ia]=Lista e commuta inter activitates de scriptorio
 Comment[id]=Daftar dan alih antara aktivitas desktop
 Comment[is]=Telur upp og skiptir milli skjáborðsvirkni
-Comment[it]=Visualizza e cambia le attività del desktop
+Comment[it]=Elenca e passa tra le attività del desktop
 Comment[ja]=デスクトップアクティビティを一覧表示して切り替える
 Comment[kk]=Белсенділіктерді тізімдеу және ауыстыру
 Comment[km]=មើល ហើយ​ប្ដូរ​ប្លង់​ផ្ទៃតុ​សកម្ម​
diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop
index 6c8de2027..50341a0d3 100644
--- a/runners/baloo/plasma-runner-baloosearch.desktop
+++ b/runners/baloo/plasma-runner-baloosearch.desktop
@@ -60,7 +60,7 @@ Comment[fr]=Recherche dans les fichiers, les courriels et les contacts
 Comment[gl]=Busca nos ficheiros, correos e contactos.
 Comment[hu]=Keresés fájlokban, e-mailekben és névjegyekben
 Comment[id]=Pencarian melalui file, email dan kontak
-Comment[it]=Cerca tra file, messaggi di posta e contatti
+Comment[it]=Cerca tra i file, i messaggi di posta ed i contatti
 Comment[ko]=파일, 이메일, 연락처 검색
 Comment[lt]=Ieško failuose, el. laiškuose ir kontaktuose
 Comment[nl]=Doorzoekt bestanden, e-mailberichten en contactpersonen
diff --git a/runners/bookmarks/plasma-runner-bookmarks.desktop b/runners/bookmarks/plasma-runner-bookmarks.desktop
index 7403a4dc6..d6dfcadd5 100644
--- a/runners/bookmarks/plasma-runner-bookmarks.desktop
+++ b/runners/bookmarks/plasma-runner-bookmarks.desktop
@@ -102,7 +102,7 @@ Comment[hu]=Könyvjelzőmegnyitó
 Comment[ia]=Trova e aperi marcatores de libro
 Comment[id]=Cari dan buka markah
 Comment[is]=Finna og opna bókamerki
-Comment[it]=Trova e apri segnalibri
+Comment[it]=Trova e apre i segnalibri
 Comment[ja]=ブックマークを探して開きます
 Comment[kk]=Бетбелгілерді тауып ашу
 Comment[km]=រក​ និង​បើក​ចំណាំ
diff --git a/runners/calculator/plasma-runner-calculator.desktop b/runners/calculator/plasma-runner-calculator.desktop
index b15c017d2..c83b4c423 100644
--- a/runners/calculator/plasma-runner-calculator.desktop
+++ b/runners/calculator/plasma-runner-calculator.desktop
@@ -111,7 +111,7 @@ Comment[hu]=Kifejezéseket kezelni tudó számológép
 Comment[ia]=Calcula expressiones
 Comment[id]=Kalkukasi ekspresi
 Comment[is]=Reikna segðir
-Comment[it]=Calcola espressioni
+Comment[it]=Calcola le espressioni
 Comment[ja]=数式を計算します
 Comment[kk]=Өрнектерді есептеу
 Comment[km]=គណនា​កន្សោម​​
diff --git a/runners/locations/plasma-runner-locations.desktop b/runners/locations/plasma-runner-locations.desktop
index 3d85b30b9..a2fe2ea29 100644
--- a/runners/locations/plasma-runner-locations.desktop
+++ b/runners/locations/plasma-runner-locations.desktop
@@ -107,7 +107,7 @@ Comment[hu]=Fájlmegnyitó
 Comment[ia]=Aperitor de file e de URL
 Comment[id]=Pembuka File dan URL
 Comment[is]=Opnun skráa og slóða
-Comment[it]=Apertura di file e URL
+Comment[it]=Apertura di file e di URL
 Comment[ja]=ファイルと URL を開きます
 Comment[kk]=Файл мен URL ашқышы
 Comment[km]=កម្មវិធី​បើក ឯកសារ និង URL
diff --git a/runners/places/plasma-runner-places.desktop b/runners/places/plasma-runner-places.desktop
index e4431faaf..6c7701402 100644
--- a/runners/places/plasma-runner-places.desktop
+++ b/runners/places/plasma-runner-places.desktop
@@ -99,7 +99,7 @@ Comment[hu]=Eszközökre és mappákra mutató könyvjelzők megnyitása
 Comment[ia]=Aperi dispositivos e marcatores de libros de dossieres
 Comment[id]=Buka perangkat dan markah folder
 Comment[is]=Opna bókamerki fyrir tæki og möppur
-Comment[it]=Apre segnalibri di dispositivi e cartelle
+Comment[it]=Apre i segnalibri dei dispositivi e delle cartelle
 Comment[ja]=デバイスやブックマークされたフォルダを開きます
 Comment[kk]=Құрылғы мен қапшықтардың бетбелгілерін ашу
 Comment[km]=បើក​ឧបករណ៍ និង​ចំណាំ​ថត
diff --git a/runners/sessions/plasma-runner-sessions.desktop b/runners/sessions/plasma-runner-sessions.desktop
index 56de9d044..6d6a06613 100644
--- a/runners/sessions/plasma-runner-sessions.desktop
+++ b/runners/sessions/plasma-runner-sessions.desktop
@@ -32,7 +32,7 @@ Name[hu]=Asztali munkamenetek
 Name[ia]=Sessiones de scriptorio
 Name[id]=Sesi Desktop
 Name[is]=Skjáborðssetur
-Name[it]=Sessioni di desktop
+Name[it]=Sessioni desktop
 Name[ja]=デスクトップセッション
 Name[kk]=Үстел сеансы
 Name[km]=សម័យ​ផ្ទៃតុ
diff --git a/runners/shell/plasma-runner-shell.desktop b/runners/shell/plasma-runner-shell.desktop
index 63f34cb73..17b728d47 100644
--- a/runners/shell/plasma-runner-shell.desktop
+++ b/runners/shell/plasma-runner-shell.desktop
@@ -109,7 +109,7 @@ Comment[hu]=Parancsokat hajt végre terminálban
 Comment[ia]=Il exeque commandos de shell
 Comment[id]=Eksekusi perintah shell
 Comment[is]=Framkvæmir skeljarskipanir
-Comment[it]=Esegue comandi della shell
+Comment[it]=Esegue dei comandi della shell
 Comment[ja]=シェルコマンドを実行します
 Comment[kk]=Қоршау-орта командаларын орындау
 Comment[km]=ប្រតិបត្តិ​ពាក្យ​បញ្ជា​សែល
diff --git a/runners/solid/plasma-runner-solid.desktop b/runners/solid/plasma-runner-solid.desktop
index b0c6fe18e..da33e7d8e 100644
--- a/runners/solid/plasma-runner-solid.desktop
+++ b/runners/solid/plasma-runner-solid.desktop
@@ -96,7 +96,7 @@ Comment[hu]=Cserélhető eszközök kezelése
 Comment[ia]=Gere dispositivos removibile
 Comment[id]=Kelola perangkat dapat dilepas
 Comment[is]=Sýsla með fjarlægjanleg tæki
-Comment[it]=Gestisci i dispositivi rimovibili
+Comment[it]=Gestisce i dispositivi rimovibili
 Comment[ja]=リムーバブルデバイスを管理します
 Comment[kk]=Ауыстырмалы құрылғыларды басқару
 Comment[km]=គ្រប់គ្រង​ឧបករណ៍​ដែល​ចល័ត​បាន
diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop
index 8352446af..77e0666d1 100644
--- a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop
+++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop
@@ -24,7 +24,7 @@ Name[hu]=Önálló widgetek
 Name[ia]=Widgets (elemento graphic) in le fenestra
 Name[id]=Widget perjendelaan
 Name[is]=Græjur í gluggum
-Name[it]=Oggetti fenestrabili
+Name[it]=Oggetti a finestra
 Name[ja]=ウィンドウ化されたウィジェット
 Name[kk]=Терезелерлі виджеттер
 Name[km]=ធាតុក្រាហ្វិក​​វីនដូ
diff --git a/runners/windows/plasma-runner-windows.desktop b/runners/windows/plasma-runner-windows.desktop
index 79e1df997..92d59a333 100644
--- a/runners/windows/plasma-runner-windows.desktop
+++ b/runners/windows/plasma-runner-windows.desktop
@@ -95,7 +95,7 @@ Comment[hu]=Kilistázza az ablakokat és asztalokat, és vált rájuk
 Comment[ia]=Lista fenestras e scriptorios e commuta  los
 Comment[id]=Daftar jendela dan desktop dan alihkan mereka
 Comment[is]=Telur upp glugga og skjáborð og skiptir á milli þeirra
-Comment[it]=Elenca e scegli finestre e desktop
+Comment[it]=Elenca e passa tra le finestre ed i desktop
 Comment[ja]=ウィンドウとデスクトップの一覧表示と切り替えを行います
 Comment[kk]=Бар терезе мен үстелдерді ұсынып оларға ауысу
 Comment[km]=រាយ​​បង្អួច និង​ផ្ទៃតុ​ ហើយ​ប្ដូរ​ពួកវា
diff --git a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop
index 6a4042cab..bb5c179e3 100644
--- a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop
+++ b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop
@@ -17,7 +17,7 @@ Name[gl]=Intérprete de ordes de Plasma
 Name[hu]=Plasma felület
 Name[id]=Shell Plasma
 Name[is]=Plasma skel
-Name[it]=Shell Plasma
+Name[it]=Shell di Plasma
 Name[ja]=Plasma シェル
 Name[ko]=Plasma 셸
 Name[lt]=Plasma apvalkalas
diff --git a/solidautoeject/solidautoeject.desktop b/solidautoeject/solidautoeject.desktop
index 1519db0d4..c74ee8018 100644
--- a/solidautoeject/solidautoeject.desktop
+++ b/solidautoeject/solidautoeject.desktop
@@ -95,7 +95,7 @@ Comment[hu]=Automatikusan kiadja a meghajtókat a kiadógomb megnyomásakor
 Comment[ia]=Il lassa fora automaticamente le drives quando lor button de expeller es pressate.
 Comment[id]=Secara otomatis mengeluarkan penggerak ketika tombol eject ditekan
 Comment[is]=Aftengir diskadrif sjálfvirkt þegar ýtt er á útspýtingarhnapp þeirra
-Comment[it]=Rilascia automaticamente le unità quando ne viene premuto il pulsante di espulsione
+Comment[it]=Rilascia automaticamente le unità quando viene premuto il loro pulsante di espulsione
 Comment[ja]=イジェクトボタンが押されたときに、自動的にドライブを開放します
 Comment[kk]=Алып-шығару батырмасын басқанда құрылғыны автоматты түрде босату
 Comment[km]=ចេញ​​ផ្សាយ​ដ្រាយ​ដោយ​ស្វ័យ​ប្រវត្តិ ​នៅពេល​ចុច​ប៊ូតុង​ច្រានចេញ​របស់​វា
diff --git a/statusnotifierwatcher/statusnotifierwatcher.desktop b/statusnotifierwatcher/statusnotifierwatcher.desktop
index 4e15191df..ed40fbb65 100644
--- a/statusnotifierwatcher/statusnotifierwatcher.desktop
+++ b/statusnotifierwatcher/statusnotifierwatcher.desktop
@@ -82,7 +82,7 @@ Comment[hu]=Kezeli az állapotértesítést nyújtó szolgáltatásokat
 Comment[ia]=Il gere servicios que forni interfacies de usator pro notificator de stato
 Comment[id]=Mengelola layanan yang menyediakan notifikasi status antarmuka pengguna
 Comment[is]=Stjórnar þjónustum sem sjá um stöðutilkynningar notendaviðmóta
-Comment[it]=Gestisce i servizi che forniscono interfacce utente al notificatore di stato
+Comment[it]=Gestisce i servizi che forniscono le interfacce utente al notificatore di stato
 Comment[ja]=ステータス通知ユーザインターフェースを提供するサービスを管理
 Comment[kk]=Күй-жайы туралы құлақтандыру интерфейсін қамтамасыз ететін қызметін басқару
 Comment[km]=គ្រប់គ្រង​សារ​ដែល​ផ្ដល់​កម្មវិធី​​ជូនដំណឹង​អំពី​ស្ថានភាព​ចំណុច​ប្រទាក់​អ្នកប្រើ
diff --git a/systemmonitor/ksysguard.desktop b/systemmonitor/ksysguard.desktop
index 773b602b8..883b0ee70 100644
--- a/systemmonitor/ksysguard.desktop
+++ b/systemmonitor/ksysguard.desktop
@@ -28,7 +28,7 @@ Name[hu]=KSysGuard
 Name[ia]=KSysGuard
 Name[id]=KSysguard
 Name[is]=KDE kerfisvörður
-Name[it]=KSysguard
+Name[it]=Monitor di sistema
 Name[ja]=KSysguard
 Name[ko]=KSysguard
 Name[lt]=KSysguard
@@ -73,7 +73,7 @@ Comment[he]=הפעל את מנהל התהליכים עם Ctrl + Escape
 Comment[hu]=KSysguard futtatása a Ctrl+Esc megnyomásakor
 Comment[id]=Jalankan KSysguard dengan Ctrl + Escape
 Comment[is]=Ræsir KSysguard kerfisvörðinn með Ctrl + Escape
-Comment[it]=Esegue KSysguard con Ctrl + Esc
+Comment[it]=Avvia Monitor di sistema con Ctrl + Esc
 Comment[ja]=KSysguard を Ctrl + Escape で起動する
 Comment[ko]=Ctrl+Esc 키를 눌렀을 때 KSysguard 실행
 Comment[lt]=Paleidžia KSysguard spaudžiant Vald + Gr (Vald + Esc)
diff --git a/wallpapers/color/plasma-wallpaper-color.desktop b/wallpapers/color/plasma-wallpaper-color.desktop
index 1218d7a30..3ebcb3dd3 100644
--- a/wallpapers/color/plasma-wallpaper-color.desktop
+++ b/wallpapers/color/plasma-wallpaper-color.desktop
@@ -68,7 +68,7 @@ Comment[hu]=Egy homogén szín vagy színátmenet
 Comment[ia]=Unn color plan o gradiente
 Comment[id]=Warna polos atau gradien
 Comment[is]=Hreinn litur eða litstigull
-Comment[it]=Un colore semplice o sfumatura
+Comment[it]=Un colore semplice o una sfumatura
 Comment[ja]=単色またはグラデーション
 Comment[kk]=Жәй түс пе, градиент пе
 Comment[ko]=단색이나 그라디언트

From 3e8562227d6d6abeb4c8ae874d42d2eb52918342 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 1 Nov 2018 08:00:57 +0100
Subject: [PATCH 3/9] 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"
---
 lookandfeel/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop
index 6ef3ef227..7cf06b914 100644
--- a/lookandfeel/metadata.desktop
+++ b/lookandfeel/metadata.desktop
@@ -42,7 +42,7 @@ Comment[x-test]=xxBreeze Desktop Design Language by the KDE VDGxx
 Comment[zh_CN]=KDE 视觉设计组设计的 Breeze 桌面设计语言
 Comment[zh_TW]=KDE VDG 設計的微風桌面設計語言
 Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
-Keywords[ca]=Escriptori;Espai de treball;Aparença;Aparença i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;
+Keywords[ca]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;
 Keywords[ca@valencia]=Escriptori;Espai de treball;Aparença;Aparença i comportament;Eixida;Bloqueig;Suspensió;Aturada;Hibernació;
 Keywords[da]=Skrivebord;Desktop;Arbejdsområde;Udseende;log ud;Lås;Suspendér;Nedlukning;dvale;
 Keywords[de]=Desktop;Arbeitsfläche;Erscheinungsbild;Erscheinungsbild und Verhalten;Abmelden;Sperren;Standby;Ruhezustand;Tiefschlaf;Herunterfahren;

From e824e2f57b04f832cfb27b3c5ffbf45357ea3d6c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 2 Nov 2018 07:57:11 +0100
Subject: [PATCH 4/9] 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"
---
 lookandfeel/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop
index 7cf06b914..88d4d511d 100644
--- a/lookandfeel/metadata.desktop
+++ b/lookandfeel/metadata.desktop
@@ -43,7 +43,7 @@ Comment[zh_CN]=KDE 视觉设计组设计的 Breeze 桌面设计语言
 Comment[zh_TW]=KDE VDG 設計的微風桌面設計語言
 Keywords=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;
 Keywords[ca]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;
-Keywords[ca@valencia]=Escriptori;Espai de treball;Aparença;Aparença i comportament;Eixida;Bloqueig;Suspensió;Aturada;Hibernació;
+Keywords[ca@valencia]=Escriptori;Espai de treball;Aparença;Aspecte i comportament;Eixida;Bloqueig;Suspensió;Aturada;Hibernació;
 Keywords[da]=Skrivebord;Desktop;Arbejdsområde;Udseende;log ud;Lås;Suspendér;Nedlukning;dvale;
 Keywords[de]=Desktop;Arbeitsfläche;Erscheinungsbild;Erscheinungsbild und Verhalten;Abmelden;Sperren;Standby;Ruhezustand;Tiefschlaf;Herunterfahren;
 Keywords[el]=Επιφάνεια εργασίας;Χώρος εργασίας;Εμφάνιση;Όψη και Αίσθηση;Αποσύνδεση;Κλείδωμα;Αναστολή;Τερματισμός;Νάρκη;

From adbf495df49bae29505f394565e20b6673cebc4a Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Tue, 6 Nov 2018 10:25:16 +0000
Subject: [PATCH 5/9] Update version number for 5.14.3 GIT_SILENT

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bf2afbf2..1516e5ac5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(plasma-workspace)
-set(PROJECT_VERSION "5.14.2")
+set(PROJECT_VERSION "5.14.3")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.11.0")

From 4154e5c57ffdad9decc6745c36a04ea0ccf5f3a5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 12 Nov 2018 07:57:35 +0100
Subject: [PATCH 6/9] 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/clipboard/metadata.desktop | 2 +-
 klipper/klipper.desktop            | 2 +-
 klipper/org.kde.klipper.desktop    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applets/clipboard/metadata.desktop b/applets/clipboard/metadata.desktop
index 9aa250c9c..4fe6ce47a 100644
--- a/applets/clipboard/metadata.desktop
+++ b/applets/clipboard/metadata.desktop
@@ -59,7 +59,7 @@ Comment[fi]=Tarjoaa pääsyn leikepöydän historiaan
 Comment[fr]=Donne accès à l'historique du presse-papiers
 Comment[gl]=Fornece acceso ao historial do portapapeis.
 Comment[hu]=Hozzáférést nyújt a vágólap előzményeihez
-Comment[id]=Menyediakan akses ke riwayat clipboard
+Comment[id]=Menyediakan akses ke histori clipboard
 Comment[it]=Fornisce l'accesso alla cronologia degli appunti
 Comment[ko]=클립보드 기록 표시
 Comment[nl]=Biedt toegang tot de geschiedenis van klembord
diff --git a/klipper/klipper.desktop b/klipper/klipper.desktop
index 6c42275e3..e2b22141c 100644
--- a/klipper/klipper.desktop
+++ b/klipper/klipper.desktop
@@ -221,7 +221,7 @@ Comment[hr]=Alat za izrezivanje i preljepljivanje iz povijesti
 Comment[hsb]=Nastroj za wutřihanje a zasunjenje z prjedawšich přikazow
 Comment[hu]=Kezelőprogram a vágólaphoz (naplózással)
 Comment[ia]=Un utilitate per historia de talia & colla
-Comment[id]=Sebuah utilitas riwayat potong & tempel
+Comment[id]=Sebuah utilitas histori potong & tempel
 Comment[is]=Klipp & lím sögutól
 Comment[it]=Un programma per la cronologia del copia e incolla
 Comment[ja]=カット＆ペースト履歴ユーティリティ
diff --git a/klipper/org.kde.klipper.desktop b/klipper/org.kde.klipper.desktop
index e738b63d9..b950e750e 100644
--- a/klipper/org.kde.klipper.desktop
+++ b/klipper/org.kde.klipper.desktop
@@ -221,7 +221,7 @@ Comment[hr]=Alat za izrezivanje i preljepljivanje iz povijesti
 Comment[hsb]=Nastroj za wutřihanje a zasunjenje z prjedawšich přikazow
 Comment[hu]=Kezelőprogram a vágólaphoz (naplózással)
 Comment[ia]=Un utilitate per historia de talia & colla
-Comment[id]=Sebuah utilitas riwayat potong & tempel
+Comment[id]=Sebuah utilitas histori potong & tempel
 Comment[is]=Klipp & lím sögutól
 Comment[it]=Un programma per la cronologia del copia e incolla
 Comment[ja]=カット＆ペースト履歴ユーティリティ

From d53622d7d9e08a589809c8d820b5fa2c31d98c4b Mon Sep 17 00:00:00 2001
From: Anthony Fieroni <bvbfan@abv.bg>
Date: Tue, 13 Nov 2018 08:44:46 +0200
Subject: [PATCH 7/9] [clipboard] Limit length of clipboard text item
 visualisation

Differential Revision: https://phabricator.kde.org/D16842

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
---
 applets/clipboard/contents/ui/TextItemDelegate.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applets/clipboard/contents/ui/TextItemDelegate.qml b/applets/clipboard/contents/ui/TextItemDelegate.qml
index d54c526eb..e2ffa66c3 100644
--- a/applets/clipboard/contents/ui/TextItemDelegate.qml
+++ b/applets/clipboard/contents/ui/TextItemDelegate.qml
@@ -30,7 +30,7 @@ PlasmaComponents.Label {
     text: {
         var highlightFontTag = "<font color='" + theme.highlightColor + "'>%1</font>"
 
-        var text = DisplayRole
+        var text = DisplayRole.slice(0, 100)
 
         // first escape any HTML characters to prevent privacy issues
         text = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")

From c2be6f09fd4e5d34a601912b7ee8944d93229a55 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 15 Nov 2018 07:53:15 +0100
Subject: [PATCH 8/9] 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"
---
 lookandfeel/metadata.desktop      | 2 +-
 shell/org.kde.plasmashell.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop
index 88d4d511d..88378ceed 100644
--- a/lookandfeel/metadata.desktop
+++ b/lookandfeel/metadata.desktop
@@ -55,7 +55,7 @@ Keywords[fi]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shut
 Keywords[fr]=bureau;espace de travail;apparence;déconnexion;verrouillage;suspension;arrêt;hibernation;
 Keywords[gl]=Escritorio;Espazo de traballo;Aparencia;Aparencia e Comportamento;Saír;Trancar;Bloquear;Suspender;Apagar;Hibernar;
 Keywords[hu]=Asztal;Munkaterület;Megjelenés;Kinézet;Kijelentkezés;Zárolás;Felfüggesztés;Leállítás;Hibernálás;
-Keywords[id]=Desktop;Ruang Kerja;Penampilan;Look and Feel;Logout;Kunci;Suspensi;Matikan;Hibernasi;
+Keywords[id]=Desktop;Workspace;Penampilan;Look and Feel;Logout;Kunci;Suspensi;Matikan;Hibernasi;
 Keywords[is]=skjáborð;vinnusvæði;útlit;ásýnd og hegðun;Útskráning;Læsing;setja í bið;slökkva;svæfa;
 Keywords[it]=desktop;spazio di lavoro;aspetto;uscita;blocco;sospensione;spegnimento;ibernazione;
 Keywords[ja]=デスクトップ;ワークスペース;外観;外観と挙動;ログアウト;ロック;サスペンド;シャットダウン;休止状態;
diff --git a/shell/org.kde.plasmashell.desktop b/shell/org.kde.plasmashell.desktop
index 1c191611c..6c90794e0 100644
--- a/shell/org.kde.plasmashell.desktop
+++ b/shell/org.kde.plasmashell.desktop
@@ -22,7 +22,7 @@ Name[he]=תחנת עבודה של שולחן העבודה Plasma
 Name[hr]=Plasma radno okruženje
 Name[hu]=Plazma asztali munkaterület
 Name[ia]=Spatio de labor de scriptorio de Plasma
-Name[id]=Ruang Kerja Desktop Plasma
+Name[id]=Workspace Desktop Plasma
 Name[is]=Vinnurýmd Plasma skjáborðs
 Name[it]=Spazio di lavoro del desktop di Plasma
 Name[ja]=Plasma デスクトップワークスペース

From 867c864e7c0734277497cad0fb5362e9ffd02cc2 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Thu, 15 Nov 2018 13:16:06 -0500
Subject: [PATCH 9/9] [Baloo Runner] Filter duplicates and prefer specific type
 matches

A Presentation is also a Document so it would show up twice.
This patch filters out URLs we have already found and moves searching for specific
types (Presentation, Spreadsheet) before the more generic Document type.

Differential Revision: https://phabricator.kde.org/D16690
---
 runners/baloo/baloosearchrunner.cpp | 28 +++++++++++++++++++---------
 runners/baloo/baloosearchrunner.h   |  2 +-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/runners/baloo/baloosearchrunner.cpp b/runners/baloo/baloosearchrunner.cpp
index a55912d6d..52411c9a6 100644
--- a/runners/baloo/baloosearchrunner.cpp
+++ b/runners/baloo/baloosearchrunner.cpp
@@ -116,21 +116,24 @@ RemoteMatches SearchRunner::Match(const QString& searchTerm)
 
 void SearchRunner::performMatch()
 {
+    // Filter out duplicates
+    QSet<QUrl> foundUrls;
+
     RemoteMatches matches;
-    matches << matchInternal(m_searchTerm, QStringLiteral("Audio"), i18n("Audio"));
-    matches << matchInternal(m_searchTerm, QStringLiteral("Image"), i18n("Image"));
-    matches << matchInternal(m_searchTerm, QStringLiteral("Document"), i18n("Document"));
-    matches << matchInternal(m_searchTerm, QStringLiteral("Video"), i18n("Video"));
-    matches << matchInternal(m_searchTerm, QStringLiteral("Folder"), i18n("Folder"));
-    matches << matchInternal(m_searchTerm, QStringLiteral("Archive"), i18n("Archive"));
-    matches << matchInternal(m_searchTerm, QStringLiteral("Spreadsheet"), i18n("Spreadsheet"));
-    matches << matchInternal(m_searchTerm, QStringLiteral("Presentation"), i18n("Presentation"));
+    matches << matchInternal(m_searchTerm, QStringLiteral("Audio"), i18n("Audio"), foundUrls);
+    matches << matchInternal(m_searchTerm, QStringLiteral("Image"), i18n("Image"), foundUrls);
+    matches << matchInternal(m_searchTerm, QStringLiteral("Video"), i18n("Video"), foundUrls);
+    matches << matchInternal(m_searchTerm, QStringLiteral("Spreadsheet"), i18n("Spreadsheet"), foundUrls);
+    matches << matchInternal(m_searchTerm, QStringLiteral("Presentation"), i18n("Presentation"), foundUrls);
+    matches << matchInternal(m_searchTerm, QStringLiteral("Folder"), i18n("Folder"), foundUrls);
+    matches << matchInternal(m_searchTerm, QStringLiteral("Document"), i18n("Document"), foundUrls);
+    matches << matchInternal(m_searchTerm, QStringLiteral("Archive"), i18n("Archive"), foundUrls);
 
     QDBusConnection::sessionBus().send(m_lastRequest.createReply(QVariant::fromValue(matches)));
     m_lastRequest = QDBusMessage();
 }
 
-RemoteMatches SearchRunner::matchInternal(const QString& searchTerm, const QString &type, const QString &category)
+RemoteMatches SearchRunner::matchInternal(const QString& searchTerm, const QString &type, const QString &category, QSet<QUrl> &foundUrls)
 {
     Baloo::Query query;
     query.setSearchString(searchTerm);
@@ -154,6 +157,13 @@ RemoteMatches SearchRunner::matchInternal(const QString& searchTerm, const QStri
         RemoteMatch match;
         QString localUrl = it.filePath();
         const QUrl url = QUrl::fromLocalFile(localUrl);
+
+        if (foundUrls.contains(url)) {
+            continue;
+        }
+
+        foundUrls.insert(url);
+
         match.id = it.filePath();
         match.text = url.fileName();
         match.iconName = mimeDb.mimeTypeForFile(localUrl).iconName();
diff --git a/runners/baloo/baloosearchrunner.h b/runners/baloo/baloosearchrunner.h
index 53b99a0dd..9cb2f6e0f 100644
--- a/runners/baloo/baloosearchrunner.h
+++ b/runners/baloo/baloosearchrunner.h
@@ -46,7 +46,7 @@ public:
 private:
     void performMatch();
     RemoteMatches matchInternal(const QString &searchTerm, const QString& type,
-                                    const QString& category);
+                                    const QString& category, QSet<QUrl> &foundUrls);
 
     QDBusMessage m_lastRequest;
     QString m_searchTerm;