From 9dbe4cd03f3c111f7c9ded7acd4c49cd588ef564 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Jan 2023 02:04:14 +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.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicksettings/airplanemode/metadata.json b/quicksettings/airplanemode/metadata.json index 874c374e..5605a813 100644 --- a/quicksettings/airplanemode/metadata.json +++ b/quicksettings/airplanemode/metadata.json @@ -57,7 +57,7 @@ "Name[ca]": "Mode avió", "Name[cs]": "Režim v Letadle", "Name[da]": "Flytilstand", - "Name[de]": "Flugzeug-Modus", + "Name[de]": "Flugmodus", "Name[en_GB]": "Airplane Mode", "Name[es]": "Modo avión", "Name[eu]": "Hegaldi modua",