From 5411a5f77057e5782eebd16fc743c748d734b61e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Feb 2020 05:55:39 +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/eyeonscreen/package/metadata.desktop | 2 ++ effects/windowaperture/package/metadata.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 5b60eb42bc..47dd6f0532 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -7,6 +7,7 @@ Name[pt]=Olho no Ecrã Name[sv]=Ögat på skärmen Name[uk]=Око на екрані Name[x-test]=xxEye on Screenxx +Name[zh_TW]=螢幕之眼 Icon=preferences-system-windows-effect-eyeonscreen Comment=Suck windows into the desktop Comment[ca]=Enganxa les finestres a l'escriptori @@ -16,6 +17,7 @@ Comment[pt]=Aspira as janelas para o ecrã Comment[sv]=Sug in fönster i skrivbordet Comment[uk]=Засмоктування вікон до стільниці Comment[x-test]=xxSuck windows into the desktopxx +Comment[zh_TW]=將視窗吸進桌面 Type=Service X-Plasma-API=javascript diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 6ecd786e7f..926971e737 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -49,6 +49,7 @@ Comment[pt]=Mover as janelas para os cantos do ecrã Comment[sv]=Flytta fönster till skärmhörn Comment[uk]=Пересування вікон до кутів екрана Comment[x-test]=xxMove windows into screen cornersxx +Comment[zh_TW]=將視窗移至螢幕角落 Type=Service X-Plasma-API=javascript