From 7ef6c9c7c9717da549089314c43186e9875889fc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 4 Aug 2021 01:16:00 +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/nightcolor/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/quicksettings/nightcolor/metadata.desktop b/quicksettings/nightcolor/metadata.desktop index 0474eaff..ad62659d 100644 --- a/quicksettings/nightcolor/metadata.desktop +++ b/quicksettings/nightcolor/metadata.desktop @@ -11,6 +11,7 @@ Name[nl]=Nachtkleur Name[pl]=Barwy nocne Name[pt]=Cor Nocturna Name[pt_BR]=Cor noturna +Name[sl]=Nočna barva Name[sv]=Nattfärg Name[uk]=Нічні кольори Name[x-test]=xxNight Colorxx