From a24c6fdbb60adda8b34021fef056af812549a881 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Jan 2018 06:54:13 +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 cc7a01d7..73722e0a 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -21,6 +21,7 @@ Name[es]=Decoración de ventanas Brisa Name[eu]=Breeze leihoen apaindura Name[fi]=Breeze-ikkunankehys Name[fr]=Décoration de fenêtre Brise +Name[gl]=Decoración de xanela de Breeze Name[hu]=Breeze ablakdekoráció Name[ia]=Decoration de fenestra Breeze Name[it]=Decorazione delle finestre di Brezza diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index c1bfccf9..64b874f0 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -21,6 +21,7 @@ Name[es]=Estilo de elementos gráficos Brisa Name[eu]=Breeze trepeten estiloa Name[fi]=Breeze-elementtityyli Name[fr]=Style de composant graphique Brise +Name[gl]=Estilo do trebello de Breeze Name[hu]=Breeze elemstílus Name[ia]=Stilo de Elemento Graphic de Fenestra (Widget) de Breeze Name[it]=Stile degli oggetti di Brezza