From fa9b0c97101cf9058ae192a446f31fe0106257c3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 26 Sep 2021 01:14:52 +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 45e4c3e2..06f9bad4 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -8,6 +8,7 @@ Name[fr]=Mode Avion Name[ia]=Modo aeroplano Name[nl]=Vliegtuigmodus Name[nn]=Flymodus +Name[pl]=Tryb samolotowy Name[sl]=Letalski način Name[sv]=Flygplansläge Name[uk]=Режим польоту