From 16035a564029906baf6e56ec42d8edd8509e6885 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 22 Dec 2021 01:43:01 +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 1e401dac..486d8bb3 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -3,6 +3,7 @@ Name=Airplane Mode Name[ca]=Mode avió Name[ca@valencia]=Mode avió Name[cs]=Režim v Letadle +Name[de]=Flugzeug-Modus Name[en_GB]=Airplane Mode Name[es]=Modo avión Name[eu]=Hegaldi modua diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop index c240c13c..f91a3fc9 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -3,6 +3,7 @@ Name=Night Color Name[ca]=Color de nit Name[ca@valencia]=Color de nit Name[cs]=Noční barva +Name[de]=Nachtfarben Name[en_GB]=Night Colour Name[es]=Color nocturno Name[eu]=Gaueko kolorea