From 1affa79c8182878e3324b93bcaccf4ad20abccae Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 Dec 2018 05:37:48 +0100 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/BreezeHighContrast.colors | 1 + colors/BreezeLight.colors | 1 + 2 files changed, 2 insertions(+) diff --git a/colors/BreezeHighContrast.colors b/colors/BreezeHighContrast.colors index 8f2ef4e2..31610960 100644 --- a/colors/BreezeHighContrast.colors +++ b/colors/BreezeHighContrast.colors @@ -110,6 +110,7 @@ Name[ca@valencia]=Brisa de contrast alt Name[de]=Breeze Hoher Kontrast Name[es]=Brisa de alto contraste Name[gl]=Breeze de alto contraste +Name[it]=Brezza alto contrasto Name[nl]=Breeze met hoog contrast Name[pt]=Brisa de Alto Contraste Name[pt_BR]=Breeze Alto Contraste diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors index e74c4102..408652e9 100644 --- a/colors/BreezeLight.colors +++ b/colors/BreezeLight.colors @@ -110,6 +110,7 @@ Name[ca@valencia]=Brisa clara Name[de]=Breeze Hell Name[es]=Brisa claro Name[gl]=Breeze claro +Name[it]=Brezza chiaro Name[nl]=Breeze Light Name[pt]=Brisa Clara Name[pt_BR]=Breeze Claro