From cca4b380584a94a0240b8f7ffd4c83b1c5ee40c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 25 Sep 2021 02:15:02 +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 88f90aea..3375634c 100644 --- a/quicksettings/airplanemode/metadata.desktop +++ b/quicksettings/airplanemode/metadata.desktop @@ -7,6 +7,7 @@ Name[fr]=Mode Avion Name[ia]=Modo aeroplano Name[nl]=Vliegtuigmodus Name[nn]=Flymodus +Name[sl]=Letalski način Name[sv]=Flygplansläge Name[uk]=Режим польоту Name[x-test]=xxAirplane Modexx