From c6b55a9534484cacd2b1f94db97b34d3a27719bf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 21 Apr 2022 01:44:16 +0000
Subject: [PATCH] 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/mobileshell/package/metadata.desktop        | 3 +++
 quicksettings/keyboardtoggle/metadata.desktop    | 1 +
 quicksettings/powermenu/package/metadata.desktop | 1 +
 quicksettings/settingsapp/metadata.desktop       | 1 +
 4 files changed, 6 insertions(+)

diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop
index f3f97603..891b6cdb 100644
--- a/kcms/mobileshell/package/metadata.desktop
+++ b/kcms/mobileshell/package/metadata.desktop
@@ -16,6 +16,7 @@ Name[fr]=Shell
 Name[hi]=शेल
 Name[hu]=Felület
 Name[ia]=Shell
+Name[it]=Shell
 Name[ko]=셸
 Name[nl]=Shell
 Name[nn]=Skal
@@ -41,6 +42,7 @@ Comment[fr]=Configurer le shell du système
 Comment[hi]=तंत्र शेल विन्यस्त करें
 Comment[hu]=A rendszerfelület beállítása
 Comment[ia]=Configura le shell de systema
+Comment[it]=Configura la shell di sistema
 Comment[ko]=시스템 셸 설정
 Comment[nl]=De systeem-shell configureren
 Comment[nn]=Set opp systemskalet
@@ -82,6 +84,7 @@ X-KDE-Keywords[fr]=système, shell, panneau
 X-KDE-Keywords[hi]=तंत्र,शैल,पैनल
 X-KDE-Keywords[hu]=rendszer,felület,panel
 X-KDE-Keywords[ia]=system,systema,shell,pannello
+X-KDE-Keywords[it]=sistema,shell,pannello
 X-KDE-Keywords[ko]=system,shell,panel,시스템,셸,패널
 X-KDE-Keywords[nl]=systeem,shell,paneel
 X-KDE-Keywords[nn]=system,skal,shell,panel
diff --git a/quicksettings/keyboardtoggle/metadata.desktop b/quicksettings/keyboardtoggle/metadata.desktop
index f419a543..41914397 100644
--- a/quicksettings/keyboardtoggle/metadata.desktop
+++ b/quicksettings/keyboardtoggle/metadata.desktop
@@ -14,6 +14,7 @@ Name[fi]=Näytä tai piilota näyttönäppäimistö
 Name[fr]=Basculement vers /hors clavier virtuel
 Name[hu]=Virtuális billentyűzet kapcsoló
 Name[ia]=Commuta Claviero Virtual
+Name[it]=Attiva/disattiva la tastiera virtuale
 Name[ko]=가상 키보드 전환
 Name[nl]=Omschakeling van virtueel toetsenbord
 Name[pt]=Comutar o Teclado Virtual
diff --git a/quicksettings/powermenu/package/metadata.desktop b/quicksettings/powermenu/package/metadata.desktop
index 24d13db1..0c57733c 100644
--- a/quicksettings/powermenu/package/metadata.desktop
+++ b/quicksettings/powermenu/package/metadata.desktop
@@ -14,6 +14,7 @@ Name[fr]=Menu « Énergie »
 Name[hi]=शक्ती मेन्यू
 Name[hu]=Energia menü
 Name[ia]=Menu de Potentia
+Name[it]=Menu accensione
 Name[ko]=전원 메뉴
 Name[nl]=Energiemenu
 Name[nn]=Kraftmeny
diff --git a/quicksettings/settingsapp/metadata.desktop b/quicksettings/settingsapp/metadata.desktop
index 99424ea7..bbf5f29c 100644
--- a/quicksettings/settingsapp/metadata.desktop
+++ b/quicksettings/settingsapp/metadata.desktop
@@ -33,6 +33,7 @@ Description[en_GB]=Settings application quick setting
 Description[es]=Ajuste rápido de la aplicación de preferencias
 Description[fi]=Asetussovelluksen pika-asetus
 Description[fr]=Configuration rapide de la configuration d'une application
+Description[it]=Impostazione delle impostazioni rapide
 Description[ko]=설정 프로그램 빠른 설정
 Description[nl]=Snelle instelling van toepassing voor instellingen
 Description[pt]=Configuração rápida da aplicação de definições