From 07dfe5d6d5565b15eed5c14f9e6343c0abc9cba6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 19 Sep 2021 02:36: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"
---
 quicksettings/airplanemode/metadata.desktop | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop
index bc995c38..1573355b 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -2,11 +2,13 @@
 Name=Airplane Mode
 Name[ca]=Mode avió
 Name[es]=Modo avión
+Name[fr]=Mode Avion
 Name[ia]=Modo aeroplano
 Name[nl]=Vliegtuigmodus
 Name[sv]=Flygplansläge
 Name[uk]=Режим польоту
 Name[x-test]=xxAirplane Modexx
+Name[zh_CN]=飞行模式
 Icon=network-flightmode-on
 
 Type=Service