From 8e13435ccb4c154c1ea9099ee0f329ba751a81e4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 29 Mar 2022 02:17:10 +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"
---
 containments/panel/package/metadata.desktop     | 2 +-
 containments/taskpanel/package/metadata.desktop | 2 +-
 kcms/mobileshell/package/metadata.desktop       | 5 ++++-
 look-and-feel/metadata.desktop                  | 4 ++--
 quicksettings/keyboardtoggle/metadata.desktop   | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/containments/panel/package/metadata.desktop b/containments/panel/package/metadata.desktop
index 60ee2824..f2418697 100644
--- a/containments/panel/package/metadata.desktop
+++ b/containments/panel/package/metadata.desktop
@@ -8,7 +8,7 @@ Name=Phone Panel
 Name[ast]=Panel del teléfonu
 Name[az]=Telefon paneli
 Name[ca]=Plafó del telèfon
-Name[ca@valencia]=Plafó del telèfon
+Name[ca@valencia]=Quadre del telèfon
 Name[cs]=Panel telefonu
 Name[da]=Panel til telefon
 Name[en_GB]=Phone Panel
diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop
index 78893942..5ed24a7b 100644
--- a/containments/taskpanel/package/metadata.desktop
+++ b/containments/taskpanel/package/metadata.desktop
@@ -8,7 +8,7 @@ Name=Phone Task panel
 Name[ast]=Panel de xeres del teléfonu
 Name[az]=Telefon tapşırıq paneli
 Name[ca]=Plafó de tasques del telèfon
-Name[ca@valencia]=Plafó de tasques del telèfon
+Name[ca@valencia]=Quadre de tasques del telèfon
 Name[da]=Opgavepanel til telefon
 Name[en_GB]=Phone Task panel
 Name[es]=Panel de tareas del teléfono
diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop
index bbc13583..f4479207 100644
--- a/kcms/mobileshell/package/metadata.desktop
+++ b/kcms/mobileshell/package/metadata.desktop
@@ -11,6 +11,7 @@ Name[de]=Shell
 Name[en_GB]=Shell
 Name[es]=Intérprete de órdenes
 Name[eu]=Oskola
+Name[fi]=Komentotulkki
 Name[fr]=Shell
 Name[hi]=शेल
 Name[hu]=Felület
@@ -34,6 +35,7 @@ Comment[ca@valencia]=Configura l'intèrpret d'ordres del sistema
 Comment[en_GB]=Configure the system shell
 Comment[es]=Configura el intérprete de órdenes del sistema
 Comment[eu]=Konfiguratu sistemaren oskola
+Comment[fi]=Aseta järjestelmän komentotulkki
 Comment[fr]=Configurer le shell du système
 Comment[hi]=तंत्र शेल विन्यस्त करें
 Comment[hu]=A rendszerfelület beállítása
@@ -69,10 +71,11 @@ X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-Keywords=system,shell,panel
 X-KDE-Keywords[az]=sistem,örtük,panel
 X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó
-X-KDE-Keywords[ca@valencia]=sistema,intèrpret d'ordres,plafó
+X-KDE-Keywords[ca@valencia]=sistema,intèrpret d'ordres,quadre
 X-KDE-Keywords[en_GB]=system,shell,panel
 X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel
 X-KDE-Keywords[eu]=sistema,shell,oskola,panela
+X-KDE-Keywords[fi]=järjestelmä,komentotulkki,paneeli
 X-KDE-Keywords[fr]=système, shell, panneau
 X-KDE-Keywords[hi]=तंत्र,शैल,पैनल
 X-KDE-Keywords[hu]=rendszer,felület,panel
diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop
index ef230e14..83f899ae 100644
--- a/look-and-feel/metadata.desktop
+++ b/look-and-feel/metadata.desktop
@@ -6,7 +6,7 @@ Name=Plasma Phone
 Name[ast]=Plasma Phone
 Name[az]=Plasma Telefon
 Name[ca]=Telèfon del Plasma
-Name[ca@valencia]=Telèfon del Plasma
+Name[ca@valencia]=Telèfon de Plasma
 Name[cs]=Plasma Phone
 Name[da]=Plasma Phone
 Name[de]=Plasma Phone
@@ -44,7 +44,7 @@ Comment=Plasma workspace for smartphones
 Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes
 Comment[az]=Smartfonlar üçün Plasma iş sahəsi
 Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents
-Comment[ca@valencia]=Espai de treball del Plasma per a telèfons intel·ligents
+Comment[ca@valencia]=Espai de treball de Plasma per a telèfons intel·ligents
 Comment[da]=Plasma arbejdsområde til smartphones
 Comment[de]=Plasma-Arbeitsbereich für Smartphones
 Comment[en_GB]=Plasma workspace for smartphones
diff --git a/quicksettings/keyboardtoggle/metadata.desktop b/quicksettings/keyboardtoggle/metadata.desktop
index 03994c60..f419a543 100644
--- a/quicksettings/keyboardtoggle/metadata.desktop
+++ b/quicksettings/keyboardtoggle/metadata.desktop
@@ -10,6 +10,7 @@ Name[cs]=Přepínání virtuální klávesnice
 Name[en_GB]=Virtual Keyboard Toggle
 Name[es]=Conmutación del teclado virtual
 Name[eu]=Alegiazko teklatua txandakatzea
+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