From 5eec4efd198518914abbedbaae93ab181ea64238 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 12 Sep 2017 04:55:37 +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 f443b2b1..36810b26 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -11,6 +11,7 @@ X-KDE-Weight=60 Name=Breeze Window Decoration Name[ca]=Decoració de les finestres Brisa +Name[ca@valencia]=Decoració de les finestres Brisa 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 03d8cac9..bdfc3e7d 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -11,6 +11,7 @@ X-KDE-Weight=50 Name=Breeze Widget Style Name[ca]=Estil dels estris Brisa +Name[ca@valencia]=Estil dels estris Brisa Name[el]=Στιλ γραφικών συστατικών Breeze Name[es]=Estilo de elementos gráficos Brisa Name[eu]=Breeze trepeten estiloa