From 48002ab7fe675f07d3332207025fc54855202fbd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 Oct 2018 06:54:14 +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" --- effects/logout/package/metadata.desktop | 1 + effects/showpaint/showpaint_config.desktop | 1 + kcmkwin/kwinscreenedges/kwinscreenedges.desktop | 1 - packageplugins/effect/kwin-packagestructure-effect.desktop | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 740bf77738..aed7e8c125 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -29,6 +29,7 @@ Comment=Smoothly fade to the logout screen Comment[ca]=Transició suau a la pantalla de sortida Comment[ca@valencia]=Transició suau a la pantalla d'eixida Comment[cs]=Plynule přejít na odhlašovací obrazovku +Comment[de]=Blendet den Abmeldungsdialog langsam ein. Comment[en_GB]=Smoothly fade to the logout screen Comment[es]=Desvanecer suavemente hasta la pantalla de cierre de sesión Comment[eu]=Emeki desagertu saio-ixteko pantailarantz diff --git a/effects/showpaint/showpaint_config.desktop b/effects/showpaint/showpaint_config.desktop index 3d53edfbb5..c35ecf5489 100644 --- a/effects/showpaint/showpaint_config.desktop +++ b/effects/showpaint/showpaint_config.desktop @@ -68,3 +68,4 @@ Name[ug]=سىزىش دائىرىسىنى كۆرسەت Name[uk]=Показ малювання Name[wa]=Mostrer pondaedje Name[x-test]=xxShow Paintxx +Name[zh_CN]=显示绘制区域 diff --git a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop index 11b5f4b583..a374213e5f 100644 --- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop +++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop @@ -13,7 +13,6 @@ X-KDE-Weight=50 Name=Screen Edges Name[ar]=حواف الشاشة -Name[ast]=Berbesos de pantalla Name[bg]=Краища на екрана Name[bs]=Ivice ekrana Name[ca]=Vores de la pantalla diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/packageplugins/effect/kwin-packagestructure-effect.desktop index 156e251bd9..51f0b9f6d5 100644 --- a/packageplugins/effect/kwin-packagestructure-effect.desktop +++ b/packageplugins/effect/kwin-packagestructure-effect.desktop @@ -14,6 +14,7 @@ Name[ru]=Эффект диспетчера окон Name[sv]=Kwin-effekt Name[uk]=Ефект KWin Name[x-test]=xxKWin Effectxx +Name[zh_CN]=KWin 效果 Type=Service X-KDE-ServiceTypes=KPackage/PackageStructure X-KDE-Library=kwin_packagestructure_effect