From 682d57809347b943e6bab1677866744ba0a3f7e1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Dec 2023 02:30:44 +0000 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" --- src/helpers/killer/org.kde.kwin.killer.desktop.in | 2 ++ src/plugins/shakecursor/metadata.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/helpers/killer/org.kde.kwin.killer.desktop.in b/src/helpers/killer/org.kde.kwin.killer.desktop.in index 4462993c1c..aa774cff72 100755 --- a/src/helpers/killer/org.kde.kwin.killer.desktop.in +++ b/src/helpers/killer/org.kde.kwin.killer.desktop.in @@ -20,6 +20,7 @@ Name[ta]=கேவின் கட்டாயநிறுத்த உதவி Name[tr]=KWin Öldürme Yardımcısı Name[uk]=Допоміжний засіб переривання KWin Name[x-test]=xxKWin Kill Helperxx +Name[zh_CN]=KWin 强制终止辅助程序 Name[zh_TW]=KWin 強制中止工具程式 Comment=Prompts whether to kill an unresponsive window Comment[bg]=Запитва дали да прекрати принудително прозорец, който не реагира @@ -41,6 +42,7 @@ Comment[ta]=பதிலளிக்காத சாளரத்தை கட் Comment[tr]=Yanıt vermeyen bir pencereyi öldürüp öldürmek istemediğinizi sorar Comment[uk]=Надсилає запит щодо переривання програми у вікні, яке не відповідає на запити Comment[x-test]=xxPrompts whether to kill an unresponsive windowxx +Comment[zh_CN]=提示是否强制终止一个没有响应的窗口 Comment[zh_TW]=詢問是否要強制中止某個沒有回應的視窗 Exec=@KWIN_KILLER_BIN@ Terminal=false diff --git a/src/plugins/shakecursor/metadata.json b/src/plugins/shakecursor/metadata.json index 6cc115e89e..3aa37f1151 100644 --- a/src/plugins/shakecursor/metadata.json +++ b/src/plugins/shakecursor/metadata.json @@ -20,6 +20,7 @@ "Description[tr]": "İşaretçi hızla ileri geri hareket ettirildiğinde imleci büyütür", "Description[uk]": "Робити курсор більшим, коли вказівник швидко рухається туди-сюди", "Description[x-test]": "xxMakes the cursor larger when the pointer is quickly moved back and forthxx", + "Description[zh_CN]": "快速往返移动指针后加大显示光标", "Description[zh_TW]": "快速來回移動游標時讓游標變大", "EnabledByDefault": false, "License": "GPL", @@ -42,6 +43,7 @@ "Name[tr]": "İmleci Salla", "Name[uk]": "Бовтанка курсора", "Name[x-test]": "xxShake Cursorxx", + "Name[zh_CN]": "抖动后放大光标", "Name[zh_TW]": "甩動游標" } }