From e72f45bc63a60feebe1262182459715be417ea38 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 31 Oct 2019 05:32:50 +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/BreezeDark.colors | 2 +- 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 ++ kdecoration/config/breezedecorationconfig.desktop | 1 + kstyle/config/breezestyleconfig.desktop | 1 + lookandfeel.dark/metadata.desktop | 3 ++- 10 files changed, 13 insertions(+), 2 deletions(-) diff --git a/colors/BreezeDark.colors b/colors/BreezeDark.colors index 7a8b9630..b45e74c4 100644 --- a/colors/BreezeDark.colors +++ b/colors/BreezeDark.colors @@ -115,7 +115,7 @@ Name[de]=Breeze-Dunkel Name[el]=Σκοτεινό Breeze Name[en_GB]=Breeze Dark Name[es]=Brisa oscuro -Name[et]=Breeze Dark +Name[et]=Breeze tume Name[eu]=Breeze iluna Name[fi]=Breeze Dark Name[fr]=Brise sombre diff --git a/colors/BreezeHighContrast.colors b/colors/BreezeHighContrast.colors index 143cf3f9..81efbe1d 100644 --- a/colors/BreezeHighContrast.colors +++ b/colors/BreezeHighContrast.colors @@ -112,6 +112,7 @@ Name[da]=Breeze højkontrast Name[de]=Breeze Hoher Kontrast Name[en_GB]=Breeze High Contrast Name[es]=Brisa de alto contraste +Name[et]=Breeze suure kontrastiga Name[eu]=Breeze kontraste handikoa Name[fi]=Suurikontrastinen Breeze Name[fr]=Brise contraste élevé diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors index da967248..98f6d791 100644 --- a/colors/BreezeLight.colors +++ b/colors/BreezeLight.colors @@ -112,6 +112,7 @@ Name[da]=Breeze Light Name[de]=Breeze Hell Name[en_GB]=Breeze Light Name[es]=Brisa claro +Name[et]=Breeze hele Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme index 8e4ff546..16ec2c35 100644 --- a/cursors/Breeze/Breeze/index.theme +++ b/cursors/Breeze/Breeze/index.theme @@ -52,6 +52,7 @@ Comment[da]=Breeze af KDE's visuelle designgruppe Comment[de]=Breeze von der KDE VDG Comment[en_GB]=Breeze by the KDE VDG Comment[es]=Brisa por KDE VDG +Comment[et]=Breeze KDE VDG-lt Comment[eu]=Breeze, KDE VDGk egina Comment[fi]=Breeze KDE VDG:ltä Comment[fr]=Brise par KDE VDG diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme index 8e4ff546..16ec2c35 100644 --- a/cursors/Breeze/src/index.theme +++ b/cursors/Breeze/src/index.theme @@ -52,6 +52,7 @@ Comment[da]=Breeze af KDE's visuelle designgruppe Comment[de]=Breeze von der KDE VDG Comment[en_GB]=Breeze by the KDE VDG Comment[es]=Brisa por KDE VDG +Comment[et]=Breeze KDE VDG-lt Comment[eu]=Breeze, KDE VDGk egina Comment[fi]=Breeze KDE VDG:ltä Comment[fr]=Brise par KDE VDG diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index 0e55387f..5019d258 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -7,6 +7,7 @@ Name[da]=Breeze Light Name[de]=Breeze Hell Name[en_GB]=Breeze Light Name[es]=Brisa claro +Name[et]=Breeze hele Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair @@ -36,6 +37,7 @@ Comment[da]=Breeze Light af KDE's visuelle designgruppe 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[et]=Breeze hele KDE VDG-lt Comment[eu]=Breeze argia, KDE VDGk egina Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Brise Light par KDE VDG diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index 0e55387f..5019d258 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -7,6 +7,7 @@ Name[da]=Breeze Light Name[de]=Breeze Hell Name[en_GB]=Breeze Light Name[es]=Brisa claro +Name[et]=Breeze hele Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair @@ -36,6 +37,7 @@ Comment[da]=Breeze Light af KDE's visuelle designgruppe 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[et]=Breeze hele KDE VDG-lt Comment[eu]=Breeze argia, KDE VDGk egina Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Brise Light par KDE VDG diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index 3bb40211..96e04b25 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -18,6 +18,7 @@ Name[de]=Breeze-Fensterdekoration Name[el]=Διακοσμήσεις παραθύρου Breeze Name[en_GB]=Breeze Window Decoration Name[es]=Decoración de ventanas Brisa +Name[et]=Breeze akna dekoratsioon Name[eu]=Breeze leihoen apaindura Name[fi]=Breeze-ikkunankehys Name[fr]=Décoration de fenêtre Brise diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index fa3c3680..b7807562 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -18,6 +18,7 @@ Name[de]=Breeze-Stil der Bedienelemente Name[el]=Στιλ γραφικών συστατικών Breeze Name[en_GB]=Breeze Widget Style Name[es]=Estilo de elementos gráficos Brisa +Name[et]=Breeze vidina stiil Name[eu]=Breeze trepeten estiloa Name[fi]=Breeze-elementtityyli Name[fr]=Style de composant graphique Breeze diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 6467cd33..95766ea6 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -7,6 +7,7 @@ Comment[da]=Breeze Dark af KDE's visuelle designgruppe 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[et]=Breeze tume KDE VDG-lt Comment[eu]=Breeze iluna, KDE VDGk egina Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fr]=Breeze sombre, par KDE VDG @@ -39,7 +40,7 @@ Name[de]=Breeze-Dunkel Name[el]=Σκοτεινό Breeze Name[en_GB]=Breeze Dark Name[es]=Brisa oscuro -Name[et]=Breeze Dark +Name[et]=Breeze tume Name[eu]=Breeze iluna Name[fi]=Breeze Dark Name[fr]=Brise sombre