From 0cef797eb302738cc841590a6e12dbb2347dea27 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 4 Mar 2022 01:43:59 +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/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quicksettings/nightcolor/package/metadata.desktop b/quicksettings/nightcolor/package/metadata.desktop index 7760e32f..f890eb40 100644 --- a/quicksettings/nightcolor/package/metadata.desktop +++ b/quicksettings/nightcolor/package/metadata.desktop @@ -20,7 +20,7 @@ Name[ia]=Color de Nocte Name[it]=Colore notturno Name[ko]=야간 색상 Name[nl]=Nachtkleur -Name[nn]=Nattfargar +Name[nn]=Kvelds­fargar Name[pa]=ਰਾਤ ਦੇ ਰੰਗ Name[pl]=Barwy nocne Name[pt]=Cor Nocturna