From 382077f87204299a5e1137a922c7173a563e5535 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Oct 2019 05:36:05 +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" --- kcmkwin/kwineffects/kcm_kwin_effects.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 2 ++ kcmkwin/kwinoptions/kwinadvanced.desktop | 2 ++ kcmkwin/kwinoptions/kwinfocus.desktop | 1 + kcmkwin/kwinoptions/kwinmoving.desktop | 2 ++ kcmkwin/kwinoptions/kwinoptions.desktop | 1 + 6 files changed, 9 insertions(+) diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index 046826e749..89c8163a09 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -80,6 +80,7 @@ Comment[sk]=Nastavenia kompozítora pre efekty plochy Comment[sv]=Anpassa sammansättningsinställningar för skrivbordseffekter Comment[uk]=Налаштовування параметрів засобу композиції для ефектів стільниці Comment[x-test]=xxConfigure compositor settings for desktop effectsxx +Comment[zh_CN]=配置桌面特效混成器设置 Comment[zh_TW]=設定桌面特效的合成器設定 X-KDE-Keywords=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale effect,screenshot effect,sheet effect,slide effect,sliding popups effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,present windows effect,resize window effect,background contrast effect diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 93ef9c86b4..336e6cf937 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -29,6 +29,7 @@ Name[sk]=Akcie ok&na Name[sv]=Fönsteråtgärder Name[uk]=Дії з вікнами Name[x-test]=xxWindow Actionsxx +Name[zh_CN]=窗口动作 Name[zh_TW]=視窗動作 Comment=Configure mouse actions for windows and titlebars @@ -51,6 +52,7 @@ Comment[sk]=Nastavenie akcií myši pre okná a titulkové pruhy Comment[sv]=Anpassa musåtgärder för fönster och namnlister Comment[uk]=Налаштовування керування мишею для вікон та смужок заголовків Comment[x-test]=xxConfigure mouse actions for windows and titlebarsxx +Comment[zh_CN]=配置窗口和标题栏的鼠标动作 Comment[zh_TW]=設定視窗及標題列的滑鼠動作 X-KDE-Keywords=shade,maximise,maximize,minimize,minimise,lower,operations menu,titlebar,resize diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 883387ce2c..03450227aa 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -28,6 +28,7 @@ Name[sk]=Pokročilé správanie okien Name[sv]=Avancerat fönsterbeteende Name[uk]=Додаткові параметри вікон Name[x-test]=xxAdvanced Window Behaviorxx +Name[zh_CN]=高级窗口行为 Name[zh_TW]=進階視窗行為 Comment=Configure advanced window management options @@ -50,6 +51,7 @@ Comment[sk]=Nastaviť pokročilé možnosti správy okien Comment[sv]=Anpassa avancerade fönsterhanteringsalternativ Comment[uk]=Налаштовування додаткових параметрів керування вікнами Comment[x-test]=xxConfigure advanced window management optionsxx +Comment[zh_CN]=配置高级窗口管理选项 Comment[zh_TW]=設定進階視窗管理選項 X-KDE-Keywords=unshade,unshading,shade,shading,border,hover,active borders,tiling,tabs,tabbing,window,window tabbing,window grouping,window tiling,placement,window placement,placement of windows,window advanced behavior diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 641bd7e589..781a0e93d3 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -27,6 +27,7 @@ Name[sk]=Správanie zamerania okien Name[sv]=Fönsterfokusbeteende Name[uk]=Параметри фокусування вікон Name[x-test]=xxWindow Focus Behaviorxx +Name[zh_CN]=窗口焦点行为 Name[zh_TW]=視窗焦點行為 Comment=Configure window activation policy diff --git a/kcmkwin/kwinoptions/kwinmoving.desktop b/kcmkwin/kwinoptions/kwinmoving.desktop index b6a7b3f047..0c689bd7ca 100644 --- a/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kcmkwin/kwinoptions/kwinmoving.desktop @@ -28,6 +28,7 @@ Name[sk]=Presuny okien Name[sv]=Fönsterförflyttning Name[uk]=Пересування вікон Name[x-test]=xxWindow Movementxx +Name[zh_CN]=窗口移动 Name[zh_TW]=視窗移動 Comment=Configure window movement options @@ -49,6 +50,7 @@ Comment[sk]=Nastavenie spôsobu presunu okien Comment[sv]=Anpassa alternativ för fönsterförflyttning Comment[uk]=Налаштовування параметрів пересування вікон Comment[x-test]=xxConfigure window movement optionsxx +Comment[zh_CN]=配置窗口移动选项 Comment[zh_TW]=設定視窗移動選項 X-KDE-Keywords=moving,smart,cascade,maximize,maximise,snap zone,snap,border diff --git a/kcmkwin/kwinoptions/kwinoptions.desktop b/kcmkwin/kwinoptions/kwinoptions.desktop index d4b69c90a7..3061bdfc81 100644 --- a/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kcmkwin/kwinoptions/kwinoptions.desktop @@ -119,6 +119,7 @@ Comment[sk]=Nastaviť akcie a správanie okien Comment[sv]=Anpassa fönsteråtgärder och beteende Comment[uk]=Налаштовування реакції та поведінки вікон Comment[x-test]=xxConfigure window actions and behaviorxx +Comment[zh_CN]=配置窗口操作和行为 Comment[zh_TW]=設定視窗動作及行為 X-KDE-Keywords=focus,placement,window behavior,window actions,animation,raise,auto raise,windows,frame,titlebar,doubleclick