From 9cc7722e2a76445249d7b4b67bf3dcbf33f0dd50 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Oct 2021 01:16:07 +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 fa667735..788b729a 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -11,6 +11,7 @@ Name[nl]=Vliegtuigmodus Name[nn]=Flymodus Name[pa]=ਏਅਰਪਲੇਨ ਮੋਡ Name[pl]=Tryb samolotowy +Name[pt]=Modo de Avião Name[pt_BR]=Modo avião Name[ru]=Режим полёта Name[sl]=Letalski način