Merge translation files from master branch.

3 files changed, 57 insertions, 55 deletions

diff --git a/tde-i18n-zh_TW/messages/tdebase/kdcop.po b/tde-i18n-zh_TW/messages/tdebase/kdcop.po
index 27d484363b1..cb788e357e5 100644
--- a/tde-i18n-zh_TW/messages/tdebase/kdcop.po
+++ b/tde-i18n-zh_TW/messages/tdebase/kdcop.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdcop\n"
-"POT-Creation-Date: 2020-05-11 13:04+0200\n"
+"POT-Creation-Date: 2020-05-28 02:58+0200\n"
 "PO-Revision-Date: 2007-04-12 12:03+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -47,105 +47,105 @@ msgstr "%1 (預設值)"
 msgid "Welcome to the TDE DCOP browser"
 msgstr "歡迎來到 TDE DCOP 瀏覽程式"
 
-#: kdcopwindow.cpp:294
+#: kdcopwindow.cpp:295
 msgid "Application"
 msgstr "應用程式"
 
-#: kdcopwindow.cpp:316
+#: kdcopwindow.cpp:317
 msgid "&Execute"
 msgstr "執行(&E)"
 
-#: kdcopwindow.cpp:326
+#: kdcopwindow.cpp:327
 msgid "Execute the selected DCOP call."
 msgstr "執行被選取的 DCOP 呼叫。"
 
-#: kdcopwindow.cpp:328
+#: kdcopwindow.cpp:329
 msgid "Language Mode"
 msgstr "語言模式"
 
-#: kdcopwindow.cpp:336
+#: kdcopwindow.cpp:337
 msgid "Set the current language export."
 msgstr "使用目前的語言輸出。"
 
-#: kdcopwindow.cpp:355
+#: kdcopwindow.cpp:356
 msgid "DCOP Browser"
 msgstr "DCOP 瀏覽器"
 
-#: kdcopwindow.cpp:402
+#: kdcopwindow.cpp:403
 msgid "No parameters found."
 msgstr "找不到參數。"
 
-#: kdcopwindow.cpp:402
+#: kdcopwindow.cpp:403
 msgid "DCOP Browser Error"
 msgstr "DCOP 瀏覽器錯誤"
 
-#: kdcopwindow.cpp:418
+#: kdcopwindow.cpp:419
 #, c-format
 msgid "Call Function %1"
 msgstr "呼叫功能 %1"
 
-#: kdcopwindow.cpp:422
+#: kdcopwindow.cpp:423
 msgid "Name"
 msgstr "名稱"
 
-#: kdcopwindow.cpp:423
+#: kdcopwindow.cpp:424
 msgid "Type"
 msgstr "類型"
 
-#: kdcopwindow.cpp:424
+#: kdcopwindow.cpp:425
 msgid "Value"
 msgstr "數值"
 
-#: kdcopwindow.cpp:631
+#: kdcopwindow.cpp:632
 msgid "X"
 msgstr "X"
 
-#: kdcopwindow.cpp:632
+#: kdcopwindow.cpp:633
 msgid "Y"
 msgstr "Y"
 
-#: kdcopwindow.cpp:662 kdcopwindow.cpp:789
+#: kdcopwindow.cpp:663 kdcopwindow.cpp:790
 #, c-format
 msgid "Cannot handle datatype %1"
 msgstr "無法處理 %1 這種資料型態"
 
-#: kdcopwindow.cpp:824
+#: kdcopwindow.cpp:825
 msgid "DCOP call failed"
 msgstr "DCOP 呼叫執行失敗"
 
-#: kdcopwindow.cpp:826
+#: kdcopwindow.cpp:827
 #, c-format
 msgid "<p>DCOP call failed.</p>%1"
 msgstr "<p> DCOP 呼叫失敗了。</p>%1"
 
-#: kdcopwindow.cpp:837
+#: kdcopwindow.cpp:838
 msgid ""
 "<p>Application is still registered with DCOP; I do not know why this call "
 "failed.</p>"
 msgstr "<p>該應用程式已經在 DCOP 註冊了；不知道怎麼會發生呼叫失敗的情況。</p>"
 
-#: kdcopwindow.cpp:849
+#: kdcopwindow.cpp:850
 msgid "<p>The application appears to have unregistered with DCOP.</p>"
 msgstr "這個應用程式似乎並沒有向 DCOP 註冊過。</p>"
 
-#: kdcopwindow.cpp:865
+#: kdcopwindow.cpp:866
 msgid "DCOP call %1 executed"
 msgstr "DCOP 呼叫的 %1 已經執行了"
 
-#: kdcopwindow.cpp:874
+#: kdcopwindow.cpp:875
 msgid "<strong>%1</strong>"
 msgstr "回應型態: <strong>%1</strong>"
 
-#: kdcopwindow.cpp:881
+#: kdcopwindow.cpp:882
 #, c-format
 msgid "Unknown type %1."
 msgstr "未知的型態 %1。"
 
-#: kdcopwindow.cpp:887
+#: kdcopwindow.cpp:888
 msgid "No returned values"
 msgstr "沒有數值傳回"
 
-#: kdcopwindow.cpp:1092
+#: kdcopwindow.cpp:1093
 #, c-format
 msgid "Do not know how to demarshal %1"
 msgstr "不知道如何處理 %1"
diff --git a/tde-i18n-zh_TW/messages/tdemultimedia/kmix.po b/tde-i18n-zh_TW/messages/tdemultimedia/kmix.po
index 34504d74acb..48a53f45fa4 100644
--- a/tde-i18n-zh_TW/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-zh_TW/messages/tdemultimedia/kmix.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-05-28 02:59+0200\n"
 "PO-Revision-Date: 2006-06-28 07:50+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -54,7 +54,7 @@ msgstr "設定全域捷徑(&G)..."
 msgid "Hardware &Information"
 msgstr "硬體資訊(&I)"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:400
+#: kmix.cpp:120 kmixdockwidget.cpp:418
 msgid "Hide Mixer Window"
 msgstr "隱藏混音器視窗"
 
@@ -148,19 +148,19 @@ msgstr "靜音(&U)"
 msgid "Select Master Channel..."
 msgstr "選擇主聲道..."
 
-#: kmixdockwidget.cpp:183
+#: kmixdockwidget.cpp:201
 msgid "Mixer cannot be found"
 msgstr "找不到混音器"
 
-#: kmixdockwidget.cpp:194
+#: kmixdockwidget.cpp:212
 msgid "Volume at %1%"
 msgstr "音量 %1%"
 
-#: kmixdockwidget.cpp:196
+#: kmixdockwidget.cpp:214
 msgid " (Muted)"
 msgstr " (靜音)"
 
-#: kmixdockwidget.cpp:404
+#: kmixdockwidget.cpp:422
 msgid "Show Mixer Window"
 msgstr "顯示混音器視窗"
 
@@ -632,11 +632,11 @@ msgstr ""
 "kmix：您沒有足夠權限去存取混音器裝置。\n"
 "請向系統管理員要求存取這個裝置 /dev/audioctl。"
 
-#: mixertoolbox.cpp:225
+#: mixertoolbox.cpp:237
 msgid "Sound drivers supported:"
 msgstr "支援的音效驅動程式："
 
-#: mixertoolbox.cpp:226
+#: mixertoolbox.cpp:238
 msgid "Sound drivers used:"
 msgstr "使用的音效驅動程式："
 
diff --git a/tde-i18n-zh_TW/messages/tdeutils/kcmlaptop.po b/tde-i18n-zh_TW/messages/tdeutils/kcmlaptop.po
index a01b5ef3c3c..93c75d782b3 100644
--- a/tde-i18n-zh_TW/messages/tdeutils/kcmlaptop.po
+++ b/tde-i18n-zh_TW/messages/tdeutils/kcmlaptop.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlaptop\n"
-"POT-Creation-Date: 2020-05-11 04:05+0200\n"
+"POT-Creation-Date: 2020-05-28 01:29+0200\n"
 "PO-Revision-Date: 2006-10-16 12:51+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -147,25 +147,38 @@ msgstr "這個按鈕可以開啟 ACPI 設定應用程式"
 msgid "Version: %1"
 msgstr "版本：%1"
 
-#: acpi.cpp:172 apm.cpp:194
+#: acpi.cpp:170 apm.cpp:192
 msgid ""
-"You will need to supply a root password to allow the privileges of the "
-"klaptop_acpi_helper to change."
-msgstr "您需要輸入 root 的密碼。"
+"The %1 application does not seem to have the same size or checksum as when "
+"it was compiled we do NOT recommend you proceed with making it setuid-root "
+"without further investigation"
+msgstr ""
+"%1 這個軟體的大小或是檢查碼不正確。我們不建議在您弄清楚怎麼回事之前就將此軟體"
+"設定為 setuid-root."
 
-#: acpi.cpp:174 acpi.cpp:186 apm.cpp:174 apm.cpp:196 apm.cpp:208 sony.cpp:115
-#: sony.cpp:127
+#: acpi.cpp:173 acpi.cpp:185 acpi.cpp:197 apm.cpp:174 apm.cpp:195 apm.cpp:207
+#: apm.cpp:219 sony.cpp:115 sony.cpp:127
 msgid "KLaptopDaemon"
 msgstr "KLaptopDaemon"
 
-#: acpi.cpp:185
+#: acpi.cpp:173 apm.cpp:195
+msgid "Run Nevertheless"
+msgstr "還是要做"
+
+#: acpi.cpp:183 apm.cpp:205
+msgid ""
+"You will need to supply a root password to allow the privileges of the "
+"klaptop_acpi_helper to change."
+msgstr "您需要輸入 root 的密碼。"
+
+#: acpi.cpp:196
 msgid ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please "
 "make sure that it is installed correctly."
 msgstr ""
 "ACPI 設定程式無法開啟，因為找不到 tdesu 這支程式。請確定您的 TDE 有正確安裝。"
 
-#: acpi.cpp:268
+#: acpi.cpp:279
 msgid ""
 "<h1>ACPI Setup</h1>This module allows you to configure ACPI for your system"
 msgstr "<h1>設定 ACPI</h1>這個模組可以讓您控制電腦的 ACPI 設定。"
@@ -253,14 +266,14 @@ msgid ""
 "it is installed correctly."
 msgstr "%1 無法開啟，因為找不到 tdesu 這支程式。請確定您的 TDE 有正確安裝。"
 
-#: apm.cpp:207
+#: apm.cpp:218
 msgid ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be "
 "found.  Please make sure that it is installed correctly."
 msgstr ""
 "無法開啟軟體暫停設定，因為找不到 tdesu 這支程式。請確定您的 TDE 有正確安裝。"
 
-#: apm.cpp:271
+#: apm.cpp:282
 msgid ""
 "<h1>APM Setup</h1>This module allows you to configure APM for your system"
 msgstr "<h1>APM 設定</h1>這個模組讓您設定 APM。"
@@ -959,14 +972,3 @@ msgid ""
 "<h1>Low battery Warning</h1>This module allows you to set an alarm in case "
 "your battery's charge is about to run out."
 msgstr "<h1>低電位警告</h1>這個模組可以讓您設定當電池電量不足時的警告。"
-
-#~ msgid ""
-#~ "The %1 application does not seem to have the same size or checksum as "
-#~ "when it was compiled we do NOT recommend you proceed with making it "
-#~ "setuid-root without further investigation"
-#~ msgstr ""
-#~ "%1 這個軟體的大小或是檢查碼不正確。我們不建議在您弄清楚怎麼回事之前就將此"
-#~ "軟體設定為 setuid-root."
-
-#~ msgid "Run Nevertheless"
-#~ msgstr "還是要做"