From 204acee2736ed5cfeba95dd82e6ffb7912bd22e0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 Oct 2021 01:20:23 +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 06f9bad4..1512a335 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[ru]=Режим полёта Name[sl]=Letalski način Name[sv]=Flygplansläge Name[uk]=Режим польоту diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop index 158cb631..7016bc72 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -15,6 +15,7 @@ Name[nn]=Nattfargar Name[pl]=Barwy nocne Name[pt]=Cor Nocturna Name[pt_BR]=Cor noturna +Name[ru]=Ночная цветовая схема Name[sk]=Nočná farba Name[sl]=Nočna barva Name[sv]=Nattfärg