From b5a2bb2abf0ae68874ec49508cfe71cb87734e0c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Nov 2018 06:26:14 +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" --- effects/scale/package/metadata.desktop | 1 + effects/squash/package/metadata.desktop | 2 ++ 2 files changed, 3 insertions(+) diff --git a/effects/scale/package/metadata.desktop b/effects/scale/package/metadata.desktop index e7e62a1ab2..f98d0121e1 100644 --- a/effects/scale/package/metadata.desktop +++ b/effects/scale/package/metadata.desktop @@ -40,6 +40,7 @@ Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando ap Comment[sv]=Gör att fönster mjukt skalas in eller ut när de visas eller döljs Comment[uk]=Плавне масштабування вікон при появі або приховуванні Comment[x-test]=xxMake windows smoothly scale in and out when they are shown or hiddenxx +Comment[zh_CN]=窗口显示或隐藏时平滑缩放 Comment[zh_TW]=顯示或隱藏視窗時以平順的比例縮放方式呈現。 Type=Service diff --git a/effects/squash/package/metadata.desktop b/effects/squash/package/metadata.desktop index 83a9ed2aaa..65facb174f 100644 --- a/effects/squash/package/metadata.desktop +++ b/effects/squash/package/metadata.desktop @@ -12,6 +12,7 @@ Comment[pt]=Esmagar as janelas quando são minimizadas Comment[sv]=Kläm fönster när de minimeras Comment[uk]=Складує вікна, якщо їх мінімізовано Comment[x-test]=xxSquash windows when they are minimizedxx +Comment[zh_CN]=最小化时压扁窗口 Comment[zh_TW]=壓縮最小化的視窗 Icon=preferences-system-windows-effect-squash Name=Squash @@ -27,6 +28,7 @@ Name[pt]=Esmagar Name[sv]=Kläm Name[uk]=Складування Name[x-test]=xxSquashxx +Name[zh_CN]=压扁 Name[zh_TW]=壓縮 Type=Service