From d7b7290451d84f234e79002ec7f9c9fe4d81b772 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 19 Oct 2021 01:17:49 +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 fc740489..58b83f97 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -5,6 +5,7 @@ Name[cs]=Režim v Letadle Name[en_GB]=Airplane Mode Name[es]=Modo avión Name[eu]=Hegaldi modua +Name[fi]=Lentokonetila Name[fr]=Mode Avion Name[hu]=Repülős üzemmód Name[ia]=Modo aeroplano