From 39a0d60c34d18cccfcbdf4df61704bf8f097dbfe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 9 Feb 2022 02:55:00 +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 50fbb6ab..2b724a7e 100644 --- a/colors/BreezeClassic.colors +++ b/colors/BreezeClassic.colors @@ -110,6 +110,7 @@ Name[az]=Breeze klassik Name[ca]=Brisa clàssica Name[ca@valencia]=Brisa clàssica Name[cs]=Breeze Classic +Name[da]=Breeze Classic Name[de]=Breeze Klassisch Name[el]=Breeze κλασικό Name[en_GB]=Breeze Classic diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 6fde990f..e09a0b09 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -2,6 +2,7 @@ Name=Honeywave Name[ca]=Honeywave Name[cs]=Vlna medu +Name[da]=Honeywave Name[es]=Onda de miel Name[fi]=Hunaja-aalto Name[fr]=Onde de miel