From 4d8bf06da18712060d38a8aa9912239cd5e43e71 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Oct 2021 01:18:16 +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 + quicksettings/nightcolor/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop index c79ba667..79ecb736 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[pa]=ਏਅਰਪਲੇਨ ਮੋਡ Name[pl]=Tryb samolotowy Name[pt_BR]=Modo avião Name[ru]=Режим полёта diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop index 7016bc72..c70d7cea 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -12,6 +12,7 @@ Name[it]=Colore notturno Name[ko]=야간 색상 Name[nl]=Nachtkleur Name[nn]=Nattfargar +Name[pa]=ਰਾਤ ਦੇ ਰੰਗ Name[pl]=Barwy nocne Name[pt]=Cor Nocturna Name[pt_BR]=Cor noturna