From 0aa8fbec61d54f8b623545dd931950eae783d61a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 Oct 2021 01:19:36 +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 + colors/BreezeDark.colors | 2 +- cursors/Breeze_Snow/Breeze_Snow/index.theme | 2 +- cursors/Breeze_Snow/src/index.theme | 2 +- wallpapers/Next/metadata.desktop | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/colors/BreezeClassic.colors b/colors/BreezeClassic.colors index 93feb076..5ae0d0e0 100644 --- a/colors/BreezeClassic.colors +++ b/colors/BreezeClassic.colors @@ -108,6 +108,7 @@ Name=Breeze Classic Name[az]=Breeze klassik Name[ca]=Brisa clàssica Name[cs]=Breeze Classic +Name[de]=Breeze Klassisch Name[el]=Breeze κλασικό Name[es]=Brisa clásico Name[eu]=Breeze klasikoa diff --git a/colors/BreezeDark.colors b/colors/BreezeDark.colors index 4d53be2c..024d0853 100644 --- a/colors/BreezeDark.colors +++ b/colors/BreezeDark.colors @@ -140,7 +140,7 @@ Name[ca]=Brisa fosca Name[ca@valencia]=Brisa fosca Name[cs]=Breeze Tmavé Name[da]=Breeze Dark -Name[de]=Breeze-Dunkel +Name[de]=Breeze Dunkel Name[el]=Breeze σκούρο Name[en_GB]=Breeze Dark Name[es]=Brisa oscuro diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index def2495e..5af96fcf 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -46,7 +46,7 @@ Comment[ca]=Brisa clara, creat pel VDG del KDE Comment[ca@valencia]=Brisa clara per al VDG de KDE Comment[cs]=Breeze Light od KDE VDG Comment[da]=Breeze Light af KDE's visuelle designgruppe -Comment[de]=Breeze-Hell von der KDE VDG +Comment[de]=Breeze Hell von der KDE VDG Comment[el]=Breeze φωτεινό από το KDE VDG Comment[en_GB]=Breeze Light by the KDE VDG Comment[es]=Brisa claro por KDE VDG diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index def2495e..5af96fcf 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -46,7 +46,7 @@ Comment[ca]=Brisa clara, creat pel VDG del KDE Comment[ca@valencia]=Brisa clara per al VDG de KDE Comment[cs]=Breeze Light od KDE VDG Comment[da]=Breeze Light af KDE's visuelle designgruppe -Comment[de]=Breeze-Hell von der KDE VDG +Comment[de]=Breeze Hell von der KDE VDG Comment[el]=Breeze φωτεινό από το KDE VDG Comment[en_GB]=Breeze Light by the KDE VDG Comment[es]=Brisa claro por KDE VDG diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 9e53d924..742f003e 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -4,6 +4,7 @@ Name[az]=Patak Name[ca]=Patak Name[cs]=Patak Name[da]=Patak +Name[de]=Patak Name[el]=Patak Name[es]=Patak Name[eu]=Patak