From 3cc0d30776aeacc2015a4a806a3b75be71ba0556 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 Nov 2017 04:57: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 a30e4ef4..14652bd4 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -35,6 +35,7 @@ Name[tr]=Breeze Pencere Dekorasyonu Name[uk]=Декорації вікон Breeze Name[x-test]=xxBreeze Window Decorationxx Name[zh_CN]=微风窗口装饰 +Name[zh_TW]=Breeze 視窗裝飾 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 5093c0f8..6bddbbd6 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -35,6 +35,7 @@ Name[tr]=Breeze Programcık Biçimi Name[uk]=Стиль віджетів Breeze Name[x-test]=xxBreeze Widget Stylexx Name[zh_CN]=微风小部件样式 +Name[zh_TW]=Breeze 元件樣式 Comment=Modify the appearance of widgets Comment[ar]=عدّل مظهر الودجات Comment[ca]=Modifica l'aparença dels estris