From abf5be8ccd97bc8eecea996ca9b290ef0a7f567b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 24 Sep 2021 01:14:39 +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 9dea9f39..45e4c3e2 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -5,6 +5,7 @@ Name[cs]=Režim v Letadle Name[es]=Modo avión Name[eu]=Hegaldi modua Name[fr]=Mode Avion +Name[ia]=Modo aeroplano Name[nl]=Vliegtuigmodus Name[nn]=Flymodus Name[sl]=Letalski način