From dbd4af9b414e8436511aa837d7fdd21e682d7200 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 11 Nov 2021 01:19:03 +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 + wallpapers/Next/metadata.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/colors/BreezeClassic.colors b/colors/BreezeClassic.colors index 2b0f52b9..eb4af903 100644 --- a/colors/BreezeClassic.colors +++ b/colors/BreezeClassic.colors @@ -120,6 +120,7 @@ Name[ia]=Brisa Classic Name[it]=Brezza classico Name[nl]=Breeze Classic Name[pl]=Klasyczna Bryza +Name[pt]=Brisa Clássica Name[pt_BR]=Breeze Classic Name[sl]=Sapica klasična Name[sv]=Breeze klassisk diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index bd35d246..d5ffe7db 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -16,6 +16,7 @@ Name[ia]=Patak Name[it]=Patak Name[nl]=Patak Name[pl]=Patak +Name[pt]=Patak Name[pt_BR]=Patak Name[sl]=Patak Name[sv]=Patak