From 945ba0cc712fb1e4f68ce8862d1fbcb864f3e6fa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Oct 2021 01:16: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" --- colors/BreezeClassic.colors | 1 + 1 file changed, 1 insertion(+) diff --git a/colors/BreezeClassic.colors b/colors/BreezeClassic.colors index c419e126..2b0f52b9 100644 --- a/colors/BreezeClassic.colors +++ b/colors/BreezeClassic.colors @@ -117,6 +117,7 @@ Name[fr]=Breeze classique Name[hi]=ब्रीज़ क्लासिक Name[hu]=Breeze Classic Name[ia]=Brisa Classic +Name[it]=Brezza classico Name[nl]=Breeze Classic Name[pl]=Klasyczna Bryza Name[pt_BR]=Breeze Classic