From 8d76bfd4f4e6207af35db91509da203fb6517296 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Sep 2021 01:15:02 +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 ab00b088..9dea9f39 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -3,6 +3,7 @@ Name=Airplane Mode Name[ca]=Mode avió Name[cs]=Režim v Letadle Name[es]=Modo avión +Name[eu]=Hegaldi modua Name[fr]=Mode Avion Name[nl]=Vliegtuigmodus Name[nn]=Flymodus