From 4aeebe0f00eff9f0b3c3cf37452beef76845efac Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 16 Sep 2017 05:07:43 +0200 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 df115a50..4b0034a1 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -16,6 +16,7 @@ Name[cs]=Dekorace oken Breeze Name[el]=Διακοσμήσεις παραθύρου Breeze Name[es]=Decoración de ventanas Brisa Name[eu]=Breeze leihoen apaindura +Name[fr]=Décoration de fenêtre Brise Name[it]=Decorazione delle finestre di Brezza Name[nl]=Breeze vensterdecoratie Name[pl]=Wygląd okien Bryzy diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index aaa4045a..7a80306e 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -16,6 +16,7 @@ Name[cs]=Styl widgetů Breeze Name[el]=Στιλ γραφικών συστατικών Breeze Name[es]=Estilo de elementos gráficos Brisa Name[eu]=Breeze trepeten estiloa +Name[fr]=Style de composant graphique Brise Name[it]=Stile degli oggetti di Brezza Name[nl]=Breeze widgetstijl Name[pl]=Wygląd interfejsu Bryzy