From 05594964d95a08adca408a722c321e82f5b26fbb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Nov 2017 04:43:04 +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" --- kdecoration/config/breezedecorationconfig.desktop | 1 + kstyle/config/breezestyleconfig.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index 14652bd4..86d2fa3a 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -14,6 +14,7 @@ Name[ca]=Decoració de les finestres Brisa Name[ca@valencia]=Decoració de les finestres Brisa Name[cs]=Dekorace oken Breeze Name[da]=Breeze vinduesdekoration +Name[de]=Breeze-Fensterdekoration Name[el]=Διακοσμήσεις παραθύρου Breeze Name[es]=Decoración de ventanas Brisa Name[eu]=Breeze leihoen apaindura diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index 6bddbbd6..2d9cc8e8 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -14,6 +14,7 @@ Name[ca]=Estil dels estris Brisa Name[ca@valencia]=Estil dels estris Brisa Name[cs]=Styl widgetů Breeze Name[da]=Breeze kontrolstil +Name[de]=Breeze-Stil der Bedienelemente Name[el]=Στιλ γραφικών συστατικών Breeze Name[es]=Estilo de elementos gráficos Brisa Name[eu]=Breeze trepeten estiloa