From ce72de243abf2260ef8afcf78cf75af3c57de294 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Mar 2019 06:00:20 +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 + cursors/Breeze/Breeze/index.theme | 1 + cursors/Breeze/src/index.theme | 1 + cursors/Breeze_Snow/Breeze_Snow/index.theme | 2 ++ cursors/Breeze_Snow/src/index.theme | 2 ++ lookandfeel.dark/metadata.desktop | 1 + 7 files changed, 9 insertions(+) diff --git a/colors/BreezeHighContrast.colors b/colors/BreezeHighContrast.colors index 274dc886..88d08e9f 100644 --- a/colors/BreezeHighContrast.colors +++ b/colors/BreezeHighContrast.colors @@ -109,6 +109,7 @@ Name[ca]=Brisa de contrast alt Name[ca@valencia]=Brisa de contrast alt Name[cs]=Breeze - Vysoký kontrast Name[de]=Breeze Hoher Kontrast +Name[en_GB]=Breeze High Contrast Name[es]=Brisa de alto contraste Name[fi]=Suurikontrastinen Breeze Name[fr]=Breeze contraste élevé diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors index c83a1286..76850439 100644 --- a/colors/BreezeLight.colors +++ b/colors/BreezeLight.colors @@ -109,6 +109,7 @@ Name[ca]=Brisa clara Name[ca@valencia]=Brisa clara Name[cs]=Breeze Světlé Name[de]=Breeze Hell +Name[en_GB]=Breeze Light Name[es]=Brisa claro Name[fi]=Breeze Light Name[fr]=Breeze clair diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme index e3ac3e31..75d7f1aa 100644 --- a/cursors/Breeze/Breeze/index.theme +++ b/cursors/Breeze/Breeze/index.theme @@ -47,6 +47,7 @@ Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE Comment[ca@valencia]=Brisa pel VDG del KDE Comment[de]=Breeze von der KDE VDG +Comment[en_GB]=Breeze by the KDE VDG Comment[es]=Brisa por KDE VDG Comment[fi]=Breeze KDE VDG:ltä Comment[fr]=Breeze par KDE VDG diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme index e3ac3e31..75d7f1aa 100644 --- a/cursors/Breeze/src/index.theme +++ b/cursors/Breeze/src/index.theme @@ -47,6 +47,7 @@ Comment=Breeze by the KDE VDG Comment[ca]=Brisa pel VDG del KDE Comment[ca@valencia]=Brisa pel VDG del KDE Comment[de]=Breeze von der KDE VDG +Comment[en_GB]=Breeze by the KDE VDG Comment[es]=Brisa por KDE VDG Comment[fi]=Breeze KDE VDG:ltä Comment[fr]=Breeze par KDE VDG diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index cfac18ef..81ad6476 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -4,6 +4,7 @@ Name[ca]=Brisa clara Name[ca@valencia]=Brisa clara Name[cs]=Breeze Světlé Name[de]=Breeze Hell +Name[en_GB]=Breeze Light Name[es]=Brisa claro Name[fi]=Breeze Light Name[fr]=Breeze clair @@ -26,6 +27,7 @@ Comment=Breeze Light by the KDE VDG Comment[ca]=Brisa clara pel VDG del KDE Comment[ca@valencia]=Brisa clara pel VDG del KDE Comment[de]=Breeze-Hell von der KDE VDG +Comment[en_GB]=Breeze Light by the KDE VDG Comment[es]=Brisa claro por KDE VDG Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Breeze Light par KDE VDG diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index cfac18ef..81ad6476 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -4,6 +4,7 @@ Name[ca]=Brisa clara Name[ca@valencia]=Brisa clara Name[cs]=Breeze Světlé Name[de]=Breeze Hell +Name[en_GB]=Breeze Light Name[es]=Brisa claro Name[fi]=Breeze Light Name[fr]=Breeze clair @@ -26,6 +27,7 @@ Comment=Breeze Light by the KDE VDG Comment[ca]=Brisa clara pel VDG del KDE Comment[ca@valencia]=Brisa clara pel VDG del KDE Comment[de]=Breeze-Hell von der KDE VDG +Comment[en_GB]=Breeze Light by the KDE VDG Comment[es]=Brisa claro por KDE VDG Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Breeze Light par KDE VDG diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 862b7dc0..9806139e 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -3,6 +3,7 @@ Comment=Breeze Dark by the KDE VDG Comment[ca]=Brisa fosca pel VDG del KDE Comment[ca@valencia]=Brisa fosca pel VDG del KDE Comment[de]=Breeze-Dunkel von der KDE VDG +Comment[en_GB]=Breeze Dark by the KDE VDG Comment[es]=Brisa oscuro por KDE VDG Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fr]=Breeze sombre, par KDE VDG