From ae77de27e2dde0dd565abb1236678960fedc31fb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 11 Oct 2021 01:22:06 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop
index 79ecb736..fa667735 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -2,6 +2,7 @@
 Name=Airplane Mode
 Name[ca]=Mode avió
 Name[cs]=Režim v Letadle
+Name[en_GB]=Airplane Mode
 Name[es]=Modo avión
 Name[eu]=Hegaldi modua
 Name[fr]=Mode Avion