From d14f21231c29937774fdaeca8dca45e1027b6ddd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 6 Oct 2021 01:19:51 +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 1512a335..c79ba667 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -9,6 +9,7 @@ Name[ia]=Modo aeroplano Name[nl]=Vliegtuigmodus Name[nn]=Flymodus Name[pl]=Tryb samolotowy +Name[pt_BR]=Modo avião Name[ru]=Режим полёта Name[sl]=Letalski način Name[sv]=Flygplansläge