From 219cd7b11566d004ea854ffbb0b09eee24e640c1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 6 Oct 2021 01:18:30 +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 5ae0d0e0..eb2b72ba 100644 --- a/colors/BreezeClassic.colors +++ b/colors/BreezeClassic.colors @@ -117,6 +117,7 @@ Name[hu]=Breeze Classic Name[ia]=Brisa Classic Name[nl]=Breeze Classic Name[pl]=Klasyczna Bryza +Name[pt_BR]=Breeze Classic Name[sl]=Sapica klasična Name[sv]=Breeze klassisk Name[uk]=Класична Breeze