From 21f28c6ae8d4df4cb6f721cc105f420cb6e03ff9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Oct 2021 01:18:59 +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 788b729a..fc740489 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -6,6 +6,7 @@ Name[en_GB]=Airplane Mode Name[es]=Modo avión Name[eu]=Hegaldi modua Name[fr]=Mode Avion +Name[hu]=Repülős üzemmód Name[ia]=Modo aeroplano Name[nl]=Vliegtuigmodus Name[nn]=Flymodus diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop index c70d7cea..40dfcb3f 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -7,6 +7,7 @@ Name[es]=Color nocturno Name[eu]=Gaueko kolorea Name[fi]=Yöväri Name[fr]=Couleur de nuit +Name[hu]=Éjszakai színek Name[ia]=Color de Nocte Name[it]=Colore notturno Name[ko]=야간 색상