From 925fabc34ce88b19bad77e84fd1a050175c92deb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 16 Feb 2022 01:49:48 +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/caffeine/metadata.desktop          | 1 +
 quicksettings/powermenu/package/metadata.desktop | 1 +
 3 files changed, 5 insertions(+)

diff --git a/kcms/mobileshell/package/metadata.desktop b/kcms/mobileshell/package/metadata.desktop
index 15795348..b1d01774 100644
--- a/kcms/mobileshell/package/metadata.desktop
+++ b/kcms/mobileshell/package/metadata.desktop
@@ -6,6 +6,7 @@ Name=Shell
 Name[az]=Örtük
 Name[ca]=Intèrpret d'ordres
 Name[es]=Intérprete de órdenes
+Name[fr]=Shell
 Name[hu]=Felület
 Name[nl]=Shell
 Name[sl]=Shell
@@ -15,6 +16,7 @@ Comment=Configure the system shell
 Comment[az]=Sistem 
 Comment[ca]=Configura l'intèrpret d'ordres del sistema
 Comment[es]=Configura el intérprete de órdenes del sistema
+Comment[fr]=Configurer le shell du système
 Comment[hu]=A rendszerfelület beállítása
 Comment[nl]=De systeem-shell configureren
 Comment[sl]=Nastavi sistemski shell
@@ -40,6 +42,7 @@ 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[es]=sistema,intérprete,intérprete de órdenes,panel
+X-KDE-Keywords[fr]=système, shell, panneau
 X-KDE-Keywords[hu]=rendszer,felület,panel
 X-KDE-Keywords[nl]=systeem,shell,paneel
 X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča
diff --git a/quicksettings/caffeine/metadata.desktop b/quicksettings/caffeine/metadata.desktop
index 27c4f10b..b8a3cbb7 100644
--- a/quicksettings/caffeine/metadata.desktop
+++ b/quicksettings/caffeine/metadata.desktop
@@ -13,6 +13,7 @@ Name[sl]=Caffeine
 Name[sv]=Koffein
 Name[uk]=Кофеїн
 Name[x-test]=xxCaffeinexx
+Name[zh_CN]=Caffeine
 Icon=system-suspend-hibernate
 
 Type=Service
diff --git a/quicksettings/powermenu/package/metadata.desktop b/quicksettings/powermenu/package/metadata.desktop
index 21c458da..eb95f028 100644
--- a/quicksettings/powermenu/package/metadata.desktop
+++ b/quicksettings/powermenu/package/metadata.desktop
@@ -13,6 +13,7 @@ Name[sl]=Meni energije
 Name[sv]=Strömmeny
 Name[uk]=Меню живлення
 Name[x-test]=xxPower Menuxx
+Name[zh_CN]=电源菜单
 Icon=system-shutdown-symbolic
 
 Type=Service