From d886ea90041d3e2303b1a16cc424e3625e405644 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 3 Feb 2017 08:02:50 +0100 Subject: [PATCH 1/2] 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" --- kwin.notifyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kwin.notifyrc b/kwin.notifyrc index bd6e95f260..1035cea525 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -147,7 +147,7 @@ Comment[fi]=Toinen sovellus vaati keskeyttämään koostamisen. Comment[fr]=Une autre application a demandé la suspension de la composition. Comment[fy]=In oare applikaasje hat frege om compositing út te stellen. Comment[ga]=Tá feidhmchlár eile ag iarraidh comhshuí a chur ar fionraí. -Comment[gl]=Outro programa pediu que a suspensión da composición. +Comment[gl]=Outro aplicativo pediu que a suspensión da composición. Comment[he]=יישום אחר ביקש להשהות את השזירה. Comment[hr]=Neka aplikacija je dala zahtjev za paziranjem miješanja. Comment[hu]=Egy másik alkalmazás a kompozit mód felfüggesztését kérte. From 150a7bc50bd9522d7c3582d933f3f0bbe0bb93f0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Feb 2017 07:52:17 +0100 Subject: [PATCH 2/2] 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" --- packageplugins/scripts/kwin-packagestructure-scripts.desktop | 1 + .../windowswitcher/kwin-packagestructure-windowswitcher.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/packageplugins/scripts/kwin-packagestructure-scripts.desktop b/packageplugins/scripts/kwin-packagestructure-scripts.desktop index b224011d62..8847f44c0f 100644 --- a/packageplugins/scripts/kwin-packagestructure-scripts.desktop +++ b/packageplugins/scripts/kwin-packagestructure-scripts.desktop @@ -19,6 +19,7 @@ Name[sr@latin]=KWinova skripta Name[sv]=Kwin-skript Name[uk]=Скрипт KWin Name[x-test]=xxKWin Scriptxx +Name[zh_CN]=KWin 脚本 Name[zh_TW]=KWin 指令稿 Type=Service X-KDE-ServiceTypes=KPackage/PackageStructure diff --git a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop index 6f628e111e..5789929d38 100644 --- a/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop +++ b/packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop @@ -19,6 +19,7 @@ Name[sr@latin]=KWinov menjač prozora Name[sv]=Kwin-fönsterbyte Name[uk]=Перемикач вікон KWin Name[x-test]=xxKWin Window Switcherxx +Name[zh_CN]=KWin 窗口切换器 Name[zh_TW]=KWin 視窗切換器 Type=Service X-KDE-ServiceTypes=KPackage/PackageStructure