From 1e96ec0f3fc859793a61f211ed6718393ea2f471 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 18 Sep 2021 01:15:29 +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"
---
 plasma_phone_components.notifyrc            | 4 ++--
 quicksettings/airplanemode/metadata.desktop | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc
index d9130030..739c8e7b 100644
--- a/plasma_phone_components.notifyrc
+++ b/plasma_phone_components.notifyrc
@@ -30,7 +30,7 @@ Name[zh_CN]=Plasma
 
 [Event/captured]
 Name=Captured
-Name[ca]=Captura
+Name[ca]=Capturat
 Name[cs]=Zachyceno
 Name[de]=Aufgenommen
 Name[en_GB]=Captured
@@ -55,7 +55,7 @@ Name[uk]=Захоплено
 Name[x-test]=xxCapturedxx
 Name[zh_CN]=已捕获
 Comment=Captured
-Comment[ca]=Captura
+Comment[ca]=Capturat
 Comment[cs]=Zachyceno
 Comment[de]=Aufgenommen
 Comment[en_GB]=Captured
diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop
index 151f217e..b9a50c64 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -1,5 +1,12 @@
 [Desktop Entry]
 Name=Airplane Mode
+Name[ca]=Mode avió
+Name[cs]=Režim v Letadle
+Name[es]=Modo avión
+Name[nl]=Vliegtuigmodus
+Name[sv]=Flygplansläge
+Name[uk]=Режим польоту
+Name[x-test]=xxAirplane Modexx
 Icon=network-flightmode-on
 
 Type=Service