From d544f70d56956d38218a69c580cdf6824d046a0f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 25 Nov 2021 01:31:28 +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 d4863d8c..67a7fcd1 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -9,6 +9,7 @@ Name[fi]=Lentokonetila Name[fr]=Mode Avion Name[hu]=Repülős üzemmód Name[ia]=Modo aeroplano +Name[it]=Modalità aereo Name[ko]=비행기 모드 Name[nl]=Vliegtuigmodus Name[nn]=Flymodus