From 348fe884287a1f84f86116b1345b286ed6cd4c7f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Sep 2021 02:30:30 +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 1573355b..8ee29553 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -5,6 +5,7 @@ Name[es]=Modo avión Name[fr]=Mode Avion Name[ia]=Modo aeroplano Name[nl]=Vliegtuigmodus +Name[nn]=Flymodus Name[sv]=Flygplansläge Name[uk]=Режим польоту Name[x-test]=xxAirplane Modexx diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop index b62caa1d..158cb631 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -11,6 +11,7 @@ Name[ia]=Color de Nocte Name[it]=Colore notturno Name[ko]=야간 색상 Name[nl]=Nachtkleur +Name[nn]=Nattfargar Name[pl]=Barwy nocne Name[pt]=Cor Nocturna Name[pt_BR]=Cor noturna