From 27811498d4382f3b9653883553e9161cd83b99f9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 23 Sep 2021 02:14:26 +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 8ee29553..88f90aea 100644
--- a/quicksettings/airplanemode/metadata.desktop
+++ b/quicksettings/airplanemode/metadata.desktop
@@ -2,6 +2,7 @@
 Name=Airplane Mode
 Name[ca]=Mode avió
 Name[es]=Modo avión
+Name[eu]=Hegaldi modua
 Name[fr]=Mode Avion
 Name[ia]=Modo aeroplano
 Name[nl]=Vliegtuigmodus