From b4aab98f099b21d0f903b886f715ed57c2ae5a5f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 30 Sep 2021 02:11: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 + 1 file changed, 1 insertion(+) diff --git a/quicksettings/airplanemode/metadata.desktop b/quicksettings/airplanemode/metadata.desktop index 4042d1e8..06f9bad4 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Airplane Mode Name[ca]=Mode avió +Name[cs]=Režim v Letadle Name[es]=Modo avión Name[eu]=Hegaldi modua Name[fr]=Mode Avion