From 6a71eb77c61448fe21bfcc98bac19f2b06b0b21b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 Sep 2017 04:59:22 +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 4719647a..f443b2b1 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -25,6 +25,7 @@ Name[sr@latin]=Povetarčeva dekoracija prozora Name[sv]=Breeze fönsterdekoration Name[uk]=Декорації вікон Breeze Name[x-test]=xxBreeze Window Decorationxx +Name[zh_CN]=微风窗口装饰 Comment=Modify the appearance of window decorations Comment[ar]=عدّل مظهر زخرفات النّوافذ Comment[ca]=Modifica l'aparença de les decoracions de les finestres diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index fe50f189..03d8cac9 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -25,6 +25,7 @@ Name[sr@latin]=Povetarčev stil vidžetâ̂ Name[sv]=Breeze stil för grafiska komponenter Name[uk]=Стиль віджетів Breeze Name[x-test]=xxBreeze Widget Stylexx +Name[zh_CN]=微风小部件样式 Comment=Modify the appearance of widgets Comment[ar]=عدّل مظهر الودجات Comment[ca]=Modifica l'aparença dels estris