Merge translation files from master branch.

3 files changed, 285 insertions, 368 deletions

diff --git a/tde-i18n-zh_TW/messages/tdelibs/katepart.po b/tde-i18n-zh_TW/messages/tdelibs/katepart.po
index 4fcb3d07d14..fab01dc8045 100644
--- a/tde-i18n-zh_TW/messages/tdelibs/katepart.po
+++ b/tde-i18n-zh_TW/messages/tdelibs/katepart.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katepart\n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
 "PO-Revision-Date: 2006-12-18 13:07+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -603,13 +603,13 @@ msgstr "依建立日期(&R)"
 msgid "Show indentation lines"
 msgstr "顯示縮排行"
 
-#: part/katedialogs.cpp:701 part/kateview.cpp:365
+#: part/katedialogs.cpp:701 part/kateview.cpp:360
 msgid ""
 "If this option is checked, the text lines will be wrapped at the view border "
 "on the screen."
 msgstr "如果核取此選項，文字會根據螢幕上視窗寬度來折行。"
 
-#: part/katedialogs.cpp:703 part/kateview.cpp:368
+#: part/katedialogs.cpp:703 part/kateview.cpp:363
 msgid "Choose when the Dynamic Word Wrap Indicators should be displayed"
 msgstr "選擇何時要顯示動態文字折行指示器"
 
@@ -1209,7 +1209,7 @@ msgstr "您確定要繼續關閉這個檔案？可能發生資料的遺失。"
 msgid "Close Nevertheless"
 msgstr "關閉"
 
-#: part/katedocument.cpp:4331 part/katedocument.cpp:5073 part/kateview.cpp:868
+#: part/katedocument.cpp:4331 part/katedocument.cpp:5073 part/kateview.cpp:863
 msgid "Save File"
 msgstr "儲存檔案"
 
@@ -1237,16 +1237,16 @@ msgstr "檔案「%1」已被另一個程式建立了。"
 msgid "The file '%1' was deleted by another program."
 msgstr "檔案「%1」已被另一個程式刪除了。"
 
-#: part/katedocument.cpp:5101 part/kateview.cpp:895
+#: part/katedocument.cpp:5101 part/kateview.cpp:890
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr "已存在以「%1」為名的檔案。您確定要覆寫它嗎？"
 
-#: part/katedocument.cpp:5103 part/kateview.cpp:896
+#: part/katedocument.cpp:5103 part/kateview.cpp:891
 msgid "Overwrite File?"
 msgstr "覆寫檔案？"
 
-#: part/katedocument.cpp:5104 part/kateview.cpp:897
+#: part/katedocument.cpp:5104 part/kateview.cpp:892
 msgid "&Overwrite"
 msgstr "覆寫(&O)"
 
@@ -2405,444 +2405,435 @@ msgid ""
 "selected."
 msgstr "將選擇區轉換為大寫，如果沒有選擇文字則使用游標下方的文字。"
 
-#: part/kateview.cpp:287 part/kateview.cpp:589
-msgid "Delete Line"
-msgstr "刪除行"
-
-#: part/kateview.cpp:289
-#, fuzzy
-msgid "Use this to delete the current line."
-msgstr "按下這個按鈕來刪除目前選擇的項目。"
-
-#: part/kateview.cpp:291
+#: part/kateview.cpp:287
 msgid "Join Lines"
 msgstr "連接線段"
 
-#: part/kateview.cpp:293
-msgid "Use this to join lines together."
-msgstr ""
-
-#: part/kateview.cpp:304
+#: part/kateview.cpp:299
 msgid "Print the current document."
 msgstr "列印目前的文件。"
 
-#: part/kateview.cpp:306
+#: part/kateview.cpp:301
 msgid "Reloa&d"
 msgstr "重新載入(&D)"
 
-#: part/kateview.cpp:307
+#: part/kateview.cpp:302
 msgid "Reload the current document from disk."
 msgstr "由磁碟重新載入目前的文件。"
 
-#: part/kateview.cpp:310
+#: part/kateview.cpp:305
 msgid "Save the current document to disk, with a name of your choice."
 msgstr "儲存目前檔案到磁碟內，請指定檔案名稱。"
 
-#: part/kateview.cpp:313
+#: part/kateview.cpp:308
 msgid ""
 "This command opens a dialog and lets you choose a line that you want the "
 "cursor to move to."
 msgstr "這個指令開啟對話盒並讓您選擇您想要游標移動到哪一行。"
 
-#: part/kateview.cpp:315
+#: part/kateview.cpp:310
 msgid "&Configure Editor..."
 msgstr "編輯器設定(&C)..."
 
-#: part/kateview.cpp:316
+#: part/kateview.cpp:311
 msgid "Configure various aspects of this editor."
 msgstr "設定這個編輯器的各方面選項。"
 
-#: part/kateview.cpp:318
+#: part/kateview.cpp:313
 msgid "&Highlighting"
 msgstr "突顯(&H)"
 
-#: part/kateview.cpp:319
+#: part/kateview.cpp:314
 msgid "Here you can choose how the current document should be highlighted."
 msgstr "您可以在這裡選擇目前的文件該如何突顯。"
 
-#: part/kateview.cpp:322
+#: part/kateview.cpp:317
 msgid "&Filetype"
 msgstr "檔案類型(&F)"
 
-#: part/kateview.cpp:325
+#: part/kateview.cpp:320
 msgid "&Schema"
 msgstr "基模(&S)"
 
-#: part/kateview.cpp:329
+#: part/kateview.cpp:324
 msgid "&Indentation"
 msgstr "縮排(&I)"
 
-#: part/kateview.cpp:332
+#: part/kateview.cpp:327
 msgid "E&xport as HTML..."
 msgstr "匯出為 HTML(&X)"
 
-#: part/kateview.cpp:333
+#: part/kateview.cpp:328
 msgid ""
 "This command allows you to export the current document with all highlighting "
 "information into a HTML document."
 msgstr "這個指令允許您將目前的文件與突顯的資訊匯出成 HTML 文件。"
 
-#: part/kateview.cpp:337
+#: part/kateview.cpp:332
 msgid "Select the entire text of the current document."
 msgstr "選擇目前文件的所有文字。"
 
-#: part/kateview.cpp:340
+#: part/kateview.cpp:335
 msgid ""
 "If you have selected something within the current document, this will no "
 "longer be selected."
 msgstr "如果您在目前的文件中已經選擇某些東西，將無法選擇此項。"
 
-#: part/kateview.cpp:342
+#: part/kateview.cpp:337
 msgid "Enlarge Font"
 msgstr "加大字型"
 
-#: part/kateview.cpp:343
+#: part/kateview.cpp:338
 msgid "This increases the display font size."
 msgstr "這會增加顯示字型的大小。"
 
-#: part/kateview.cpp:345
+#: part/kateview.cpp:340
 msgid "Shrink Font"
 msgstr "收縮字型"
 
-#: part/kateview.cpp:346
+#: part/kateview.cpp:341
 msgid "This decreases the display font size."
 msgstr "這會減少顯示字型的大小。"
 
-#: part/kateview.cpp:349
+#: part/kateview.cpp:344
 msgid "Bl&ock Selection Mode"
 msgstr "區塊選擇模式(&O)"
 
-#: part/kateview.cpp:352
+#: part/kateview.cpp:347
 msgid ""
 "This command allows switching between the normal (line based) selection mode "
 "and the block selection mode."
 msgstr "這個指令允許在一般（以行為基礎）選擇模式與區塊選擇模式之間切換。"
 
-#: part/kateview.cpp:355
+#: part/kateview.cpp:350
 msgid "Overwr&ite Mode"
 msgstr "覆寫模式(&I)"
 
-#: part/kateview.cpp:358
+#: part/kateview.cpp:353
 msgid ""
 "Choose whether you want the text you type to be inserted or to overwrite "
 "existing text."
 msgstr "選擇您希望您輸入的文字插入或覆蓋既存的文字。"
 
-#: part/kateview.cpp:362
+#: part/kateview.cpp:357
 msgid "&Dynamic Word Wrap"
 msgstr "動態折行(&D)"
 
-#: part/kateview.cpp:367
+#: part/kateview.cpp:362
 msgid "Dynamic Word Wrap Indicators"
 msgstr "動態文字折行指示器"
 
-#: part/kateview.cpp:372
+#: part/kateview.cpp:367
 msgid "&Off"
 msgstr "關閉(&O)"
 
-#: part/kateview.cpp:373
+#: part/kateview.cpp:368
 msgid "Follow &Line Numbers"
 msgstr "跟隨行號(&L)"
 
-#: part/kateview.cpp:374
+#: part/kateview.cpp:369
 msgid "&Always On"
 msgstr "永遠開啟(&A)"
 
-#: part/kateview.cpp:378
+#: part/kateview.cpp:373
 msgid "Show Folding &Markers"
 msgstr "顯示摺疊記號"
 
-#: part/kateview.cpp:381
+#: part/kateview.cpp:376
 msgid ""
 "You can choose if the codefolding marks should be shown, if codefolding is "
 "possible."
 msgstr "如果能使用摺疊，您可以選擇是否要顯示摺疊記號。"
 
-#: part/kateview.cpp:382
+#: part/kateview.cpp:377
 msgid "Hide Folding &Markers"
 msgstr "隱藏摺疊記號(&M)"
 
-#: part/kateview.cpp:385
+#: part/kateview.cpp:380
 msgid "Show &Icon Border"
 msgstr "顯示圖示邊框(&I)"
 
-#: part/kateview.cpp:389
+#: part/kateview.cpp:384
 msgid ""
 "Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, "
 "for instance."
 msgstr "顯示/隱藏圖示邊框。<BR><BR>例如，圖示邊框顯示書籤標記。"
 
-#: part/kateview.cpp:390
+#: part/kateview.cpp:385
 msgid "Hide &Icon Border"
 msgstr "隱藏圖示邊框(&I)"
 
-#: part/kateview.cpp:393
+#: part/kateview.cpp:388
 msgid "Show &Line Numbers"
 msgstr "顯示行號(&L)"
 
-#: part/kateview.cpp:396
+#: part/kateview.cpp:391
 msgid "Show/hide the line numbers on the left hand side of the view."
 msgstr "顯示/隱藏在檢視左手邊的行編號。"
 
-#: part/kateview.cpp:397
+#: part/kateview.cpp:392
 msgid "Hide &Line Numbers"
 msgstr "隱藏行號(&L)"
 
-#: part/kateview.cpp:400
+#: part/kateview.cpp:395
 msgid "Show Scroll&bar Marks"
 msgstr "顯示捲動軸標記(&B)"
 
-#: part/kateview.cpp:403
+#: part/kateview.cpp:398
 msgid ""
 "Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for "
 "instance, show bookmarks."
 msgstr "顯示/隱藏垂直捲動軸標記。<BR><BR>例如，顯示書籤標記。"
 
-#: part/kateview.cpp:404
+#: part/kateview.cpp:399
 msgid "Hide Scroll&bar Marks"
 msgstr "隱藏捲動軸標記(&B)"
 
-#: part/kateview.cpp:407
+#: part/kateview.cpp:402
 msgid "Show Static &Word Wrap Marker"
 msgstr "顯示靜態文字折行標記(&W)"
 
-#: part/kateview.cpp:411
+#: part/kateview.cpp:406
 msgid ""
 "Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap "
 "column as defined in the editing properties"
 msgstr "顯示/隱藏文字折行標記，一條在編輯屬性中定義繪製於文字折行處的垂直線"
 
-#: part/kateview.cpp:413
+#: part/kateview.cpp:408
 msgid "Hide Static &Word Wrap Marker"
 msgstr "隱藏靜態文字折行標記(&W)"
 
-#: part/kateview.cpp:416
+#: part/kateview.cpp:411
 msgid "Switch to Command Line"
 msgstr "切換至命令列"
 
-#: part/kateview.cpp:419
+#: part/kateview.cpp:414
 msgid "Show/hide the command line on the bottom of the view."
 msgstr "顯示/隱藏在檢視底部的命令列。"
 
-#: part/kateview.cpp:421
+#: part/kateview.cpp:416
 msgid "&End of Line"
 msgstr "行的結尾(&E)"
 
-#: part/kateview.cpp:422
+#: part/kateview.cpp:417
 msgid "Choose which line endings should be used, when you save the document"
 msgstr "選擇當您儲存文件時應使用何種行結尾"
 
-#: part/kateview.cpp:432
+#: part/kateview.cpp:427
 msgid "E&ncoding"
 msgstr "編碼(&N)"
 
-#: part/kateview.cpp:449
+#: part/kateview.cpp:444
 msgid "Move Word Left"
 msgstr "左移文字"
 
-#: part/kateview.cpp:453
+#: part/kateview.cpp:448
 msgid "Select Character Left"
 msgstr "選擇左方字元"
 
-#: part/kateview.cpp:457
+#: part/kateview.cpp:452
 msgid "Select Word Left"
 msgstr "選擇左方文字"
 
-#: part/kateview.cpp:462
+#: part/kateview.cpp:457
 msgid "Move Word Right"
 msgstr "右移文字"
 
-#: part/kateview.cpp:466
+#: part/kateview.cpp:461
 msgid "Select Character Right"
 msgstr "選擇右方字元"
 
-#: part/kateview.cpp:470
+#: part/kateview.cpp:465
 msgid "Select Word Right"
 msgstr "選擇右方文字"
 
-#: part/kateview.cpp:475
+#: part/kateview.cpp:470
 msgid "Move to Beginning of Line"
 msgstr "移至行的開頭"
 
-#: part/kateview.cpp:479
+#: part/kateview.cpp:474
 msgid "Move to Beginning of Document"
 msgstr "移至文件的開頭"
 
-#: part/kateview.cpp:483
+#: part/kateview.cpp:478
 msgid "Select to Beginning of Line"
 msgstr "選擇至行的開頭"
 
-#: part/kateview.cpp:487
+#: part/kateview.cpp:482
 msgid "Select to Beginning of Document"
 msgstr "選擇至文件的開頭"
 
-#: part/kateview.cpp:492
+#: part/kateview.cpp:487
 msgid "Move to End of Line"
 msgstr "移至行的結尾"
 
-#: part/kateview.cpp:496
+#: part/kateview.cpp:491
 msgid "Move to End of Document"
 msgstr "移至文件的結尾"
 
-#: part/kateview.cpp:500
+#: part/kateview.cpp:495
 msgid "Select to End of Line"
 msgstr "選擇至行的開頭"
 
-#: part/kateview.cpp:504
+#: part/kateview.cpp:499
 msgid "Select to End of Document"
 msgstr "選擇至文件的開頭"
 
-#: part/kateview.cpp:509
+#: part/kateview.cpp:504
 msgid "Select to Previous Line"
 msgstr "選擇至上一行"
 
-#: part/kateview.cpp:513
+#: part/kateview.cpp:508
 msgid "Scroll Line Up"
 msgstr "向上捲動一行"
 
-#: part/kateview.cpp:517
+#: part/kateview.cpp:512
 msgid "Move to Next Line"
 msgstr "移至下一行"
 
-#: part/kateview.cpp:520
+#: part/kateview.cpp:515
 msgid "Move to Previous Line"
 msgstr "移至上一行"
 
-#: part/kateview.cpp:523
+#: part/kateview.cpp:518
 msgid "Move Character Right"
 msgstr "右移字元"
 
-#: part/kateview.cpp:526
+#: part/kateview.cpp:521
 msgid "Move Character Left"
 msgstr "左移字元"
 
-#: part/kateview.cpp:530
+#: part/kateview.cpp:525
 msgid "Select to Next Line"
 msgstr "選擇至下一行"
 
-#: part/kateview.cpp:534
+#: part/kateview.cpp:529
 msgid "Scroll Line Down"
 msgstr "向下捲動一行"
 
-#: part/kateview.cpp:539
+#: part/kateview.cpp:534
 msgid "Scroll Page Up"
 msgstr "向上捲動一頁"
 
-#: part/kateview.cpp:543
+#: part/kateview.cpp:538
 msgid "Select Page Up"
 msgstr "向上選擇一頁"
 
-#: part/kateview.cpp:547
+#: part/kateview.cpp:542
 msgid "Move to Top of View"
 msgstr "移至檢視頂端"
 
-#: part/kateview.cpp:551
+#: part/kateview.cpp:546
 msgid "Select to Top of View"
 msgstr "選擇至檢視頂端"
 
-#: part/kateview.cpp:556
+#: part/kateview.cpp:551
 msgid "Scroll Page Down"
 msgstr "向下捲動一頁"
 
-#: part/kateview.cpp:560
+#: part/kateview.cpp:555
 msgid "Select Page Down"
 msgstr "向下選擇一頁"
 
-#: part/kateview.cpp:564
+#: part/kateview.cpp:559
 msgid "Move to Bottom of View"
 msgstr "移至檢視底部"
 
-#: part/kateview.cpp:568
+#: part/kateview.cpp:563
 msgid "Select to Bottom of View"
 msgstr "選擇至檢視底部"
 
-#: part/kateview.cpp:572
+#: part/kateview.cpp:567
 msgid "Move to Matching Bracket"
 msgstr "移至對應括號"
 
-#: part/kateview.cpp:576
+#: part/kateview.cpp:571
 msgid "Select to Matching Bracket"
 msgstr "選擇至對應括號"
 
-#: part/kateview.cpp:584
+#: part/kateview.cpp:579
 msgid "Transpose Characters"
 msgstr "調換字元"
 
-#: part/kateview.cpp:594
+#: part/kateview.cpp:584
+msgid "Delete Line"
+msgstr "刪除行"
+
+#: part/kateview.cpp:589
 msgid "Delete Word Left"
 msgstr "刪除左方文字"
 
-#: part/kateview.cpp:599
+#: part/kateview.cpp:594
 msgid "Delete Word Right"
 msgstr "刪除右方文字"
 
-#: part/kateview.cpp:603
+#: part/kateview.cpp:598
 msgid "Delete Next Character"
 msgstr "刪除下個字元"
 
-#: part/kateview.cpp:607
+#: part/kateview.cpp:602
 msgid "Backspace"
 msgstr "Backspace"
 
-#: part/kateview.cpp:633
+#: part/kateview.cpp:628
 msgid "Collapse Toplevel"
 msgstr "收起頂端層級"
 
-#: part/kateview.cpp:635
+#: part/kateview.cpp:630
 msgid "Expand Toplevel"
 msgstr "展開頂端層級"
 
-#: part/kateview.cpp:637
+#: part/kateview.cpp:632
 msgid "Collapse One Local Level"
 msgstr "收起一個層級"
 
-#: part/kateview.cpp:639
+#: part/kateview.cpp:634
 msgid "Expand One Local Level"
 msgstr "展開一個層級"
 
-#: part/kateview.cpp:644
+#: part/kateview.cpp:639
 msgid "Show the code folding region tree"
 msgstr "顯示程式碼摺疊樹"
 
-#: part/kateview.cpp:645
+#: part/kateview.cpp:640
 msgid "Basic template code test"
 msgstr "基本樣板程式碼測試"
 
-#: part/kateview.cpp:707
+#: part/kateview.cpp:702
 msgid " OVR "
 msgstr "複寫"
 
-#: part/kateview.cpp:709
+#: part/kateview.cpp:704
 msgid " INS "
 msgstr "插入"
 
-#: part/kateview.cpp:712
+#: part/kateview.cpp:707
 msgid " R/O "
 msgstr "唯讀"
 
-#: part/kateview.cpp:717
+#: part/kateview.cpp:712
 #, c-format
 msgid " Line: %1"
 msgstr "行: %1"
 
-#: part/kateview.cpp:718
+#: part/kateview.cpp:713
 #, c-format
 msgid " Col: %1"
 msgstr "欄: %1"
 
-#: part/kateview.cpp:721
+#: part/kateview.cpp:716
 msgid " BLK "
 msgstr "區塊"
 
-#: part/kateview.cpp:721
+#: part/kateview.cpp:716
 msgid " NORM "
 msgstr " 一般 "
 
-#: part/kateview.cpp:897
+#: part/kateview.cpp:892
 msgid "Overwrite the file"
 msgstr "覆寫檔案"
 
-#: part/kateview.cpp:1799
+#: part/kateview.cpp:1794
 msgid "Export File as HTML"
 msgstr "匯出檔案為 HTML"
 
@@ -5051,6 +5042,10 @@ msgid ""
 msgstr "Bash"
 
 #, fuzzy
+#~ msgid "Use this to delete the current line."
+#~ msgstr "按下這個按鈕來刪除目前選擇的項目。"
+
+#, fuzzy
 #~ msgid "&Bookmarks"
 #~ msgstr "書籤"
 
diff --git a/tde-i18n-zh_TW/messages/tdelibs/tdeio.po b/tde-i18n-zh_TW/messages/tdelibs/tdeio.po
index ee2a8d66b8a..3c1817e976c 100644
--- a/tde-i18n-zh_TW/messages/tdelibs/tdeio.po
+++ b/tde-i18n-zh_TW/messages/tdelibs/tdeio.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio\n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
 "PO-Revision-Date: 2006-09-05 10:10+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -345,11 +345,11 @@ msgstr "這個憑證是不相關的。"
 msgid "The certificate is invalid."
 msgstr "憑證是非法的。"
 
-#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:151
+#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:149
 msgid "Current connection is secured with SSL."
 msgstr "目前連線使用 SSL 安全機制。"
 
-#: kssl/ksslinfodlg.cc:95 kssl/ksslinfodlg.cc:155
+#: kssl/ksslinfodlg.cc:95 kssl/ksslinfodlg.cc:152
 msgid "Current connection is not secured with SSL."
 msgstr "目前連線沒有使用 SSL 安全機制。"
 
@@ -370,101 +370,101 @@ msgid ""
 "The main part of this document is secured with SSL, but some parts are not."
 msgstr "該文件內的主要部份是使用 SSL 連線，但是有些部份則不是。"
 
-#: kssl/ksslinfodlg.cc:145
+#: kssl/ksslinfodlg.cc:144
 msgid "Some of this document is secured with SSL, but the main part is not."
 msgstr "該文件內的一部份有是使用 SSL 連線，但是絕大部份都不是。"
 
-#: kssl/ksslinfodlg.cc:188
+#: kssl/ksslinfodlg.cc:184
 msgid "Chain:"
 msgstr "信任鏈:"
 
-#: kssl/ksslinfodlg.cc:197
+#: kssl/ksslinfodlg.cc:193
 msgid "0 - Site Certificate"
 msgstr "0 - 站台認證憑證"
 
-#: kssl/ksslinfodlg.cc:214
+#: kssl/ksslinfodlg.cc:210
 msgid "Peer certificate:"
 msgstr "對等憑證:"
 
-#: kssl/ksslinfodlg.cc:216
+#: kssl/ksslinfodlg.cc:212
 msgid "Issuer:"
 msgstr "配發者:"
 
-#: kssl/ksslinfodlg.cc:222
+#: kssl/ksslinfodlg.cc:218
 msgid "IP address:"
 msgstr "IP 位址:"
 
-#: kssl/ksslinfodlg.cc:231 tdefile/kpropertiesdialog.cpp:2613
+#: kssl/ksslinfodlg.cc:227 tdefile/kpropertiesdialog.cpp:2613
 msgid "URL:"
 msgstr "URL："
 
-#: kssl/ksslinfodlg.cc:234
+#: kssl/ksslinfodlg.cc:230
 msgid "Certificate state:"
 msgstr "憑證狀態:"
 
-#: kssl/ksslinfodlg.cc:240
+#: kssl/ksslinfodlg.cc:236
 msgid "Valid from:"
 msgstr "有效期自:"
 
-#: kssl/ksslinfodlg.cc:242
+#: kssl/ksslinfodlg.cc:238
 msgid "Valid until:"
 msgstr "有效期到:"
 
-#: kssl/ksslinfodlg.cc:245
+#: kssl/ksslinfodlg.cc:241
 msgid "Serial number:"
 msgstr "序號:"
 
-#: kssl/ksslinfodlg.cc:247
+#: kssl/ksslinfodlg.cc:243
 msgid "MD5 digest:"
 msgstr "MD5 摘要:"
 
-#: kssl/ksslinfodlg.cc:250
+#: kssl/ksslinfodlg.cc:246
 msgid "Cipher in use:"
 msgstr "使用的加密編碼:"
 
-#: kssl/ksslinfodlg.cc:252
+#: kssl/ksslinfodlg.cc:248
 msgid "Details:"
 msgstr "詳細資料："
 
-#: kssl/ksslinfodlg.cc:254
+#: kssl/ksslinfodlg.cc:250
 msgid "SSL version:"
 msgstr "SSL 版本:"
 
-#: kssl/ksslinfodlg.cc:256
+#: kssl/ksslinfodlg.cc:252
 msgid "Cipher strength:"
 msgstr "加密編碼強度:"
 
-#: kssl/ksslinfodlg.cc:257
+#: kssl/ksslinfodlg.cc:253
 msgid "%1 bits used of a %2 bit cipher"
 msgstr "使用了 %2 位元加密算法的 %1 位元"
 
-#: kssl/ksslinfodlg.cc:413
+#: kssl/ksslinfodlg.cc:409
 msgid "Organization:"
 msgstr "組織:"
 
-#: kssl/ksslinfodlg.cc:418
+#: kssl/ksslinfodlg.cc:414
 msgid "Organizational unit:"
 msgstr "組織單位:"
 
-#: kssl/ksslinfodlg.cc:423
+#: kssl/ksslinfodlg.cc:419
 msgid "Locality:"
 msgstr "位置:"
 
-#: kssl/ksslinfodlg.cc:428
+#: kssl/ksslinfodlg.cc:424
 msgid ""
 "_: Federal State\n"
 "State:"
 msgstr "狀態:"
 
-#: kssl/ksslinfodlg.cc:433
+#: kssl/ksslinfodlg.cc:429
 msgid "Country:"
 msgstr "國家:"
 
-#: kssl/ksslinfodlg.cc:438
+#: kssl/ksslinfodlg.cc:434
 msgid "Common name:"
 msgstr "一般名稱:"
 
-#: kssl/ksslinfodlg.cc:443
+#: kssl/ksslinfodlg.cc:439
 msgid "Email:"
 msgstr "電子郵件:"
 
@@ -500,23 +500,23 @@ msgstr "儲存"
 msgid "Do Not Store"
 msgstr "不要儲存"
 
-#: kssl/ksslkeygen.cc:209
+#: kssl/ksslkeygen.cc:210
 msgid "2048 (High Grade)"
 msgstr "2048 (高階)"
 
-#: kssl/ksslkeygen.cc:210
+#: kssl/ksslkeygen.cc:211
 msgid "1024 (Medium Grade)"
 msgstr "1024 (中階)"
 
-#: kssl/ksslkeygen.cc:211
+#: kssl/ksslkeygen.cc:212
 msgid "768  (Low Grade)"
 msgstr "768  (低階)"
 
-#: kssl/ksslkeygen.cc:212
+#: kssl/ksslkeygen.cc:213
 msgid "512  (Low Grade)"
 msgstr "512  (低階)"
 
-#: kssl/ksslkeygen.cc:214
+#: kssl/ksslkeygen.cc:215
 msgid "No SSL support."
 msgstr "不支援 SSL。"
 
@@ -774,48 +774,48 @@ msgstr ""
 msgid "C&reate"
 msgstr "建立(&R)"
 
-#: misc/tdewalletd/tdewalletd.cpp:470 misc/tdewalletd/tdewalletd.cpp:650
-#: misc/tdewalletd/tdewalletd.cpp:666 misc/tdewalletd/tdewalletd.cpp:677
-#: misc/tdewalletd/tdewalletd.cpp:682 misc/tdewalletd/tdewalletd.cpp:1242
+#: misc/tdewalletd/tdewalletd.cpp:470 misc/tdewalletd/tdewalletd.cpp:651
+#: misc/tdewalletd/tdewalletd.cpp:667 misc/tdewalletd/tdewalletd.cpp:678
+#: misc/tdewalletd/tdewalletd.cpp:683 misc/tdewalletd/tdewalletd.cpp:1243
 msgid "TDE Wallet Service"
 msgstr "TDE 錢包服務"
 
-#: misc/tdewalletd/tdewalletd.cpp:486
+#: misc/tdewalletd/tdewalletd.cpp:487
 msgid ""
 "<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br>(Error code "
 "%2: %3)"
 msgstr ""
 "<qt>在開啟錢包「<b>%1</b>」時發生錯誤。請再試一次。<br>(錯誤代碼 %2: %3)"
 
-#: misc/tdewalletd/tdewalletd.cpp:561
+#: misc/tdewalletd/tdewalletd.cpp:562
 msgid "<qt>TDE has requested access to the open wallet '<b>%1</b>'."
 msgstr "<qt>TDE 被要求存取開啟的錢包「<b>%1</b>」。"
 
-#: misc/tdewalletd/tdewalletd.cpp:563
+#: misc/tdewalletd/tdewalletd.cpp:564
 msgid ""
 "<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>"
 "%2</b>'."
 msgstr "<qt>應用程式「<b>%1</b>」要求存取開啟的錢包「<b>%2</b>」。"
 
-#: misc/tdewalletd/tdewalletd.cpp:650
+#: misc/tdewalletd/tdewalletd.cpp:651
 msgid ""
 "Unable to open wallet. The wallet must be opened in order to change the "
 "password."
 msgstr "無法開啟錢包。必須開啟這個錢包才能夠改變密碼。"
 
-#: misc/tdewalletd/tdewalletd.cpp:665
+#: misc/tdewalletd/tdewalletd.cpp:666
 msgid "<qt>Please choose a new password for the wallet '<b>%1</b>'."
 msgstr "<qt>請選擇一個新的密碼給錢包「<b>%1</b>」。"
 
-#: misc/tdewalletd/tdewalletd.cpp:677
+#: misc/tdewalletd/tdewalletd.cpp:678
 msgid "Error re-encrypting the wallet. Password was not changed."
 msgstr "重新加密錢包時發生錯誤。密碼尚未變更。"
 
-#: misc/tdewalletd/tdewalletd.cpp:682
+#: misc/tdewalletd/tdewalletd.cpp:683
 msgid "Error reopening the wallet. Data may be lost."
 msgstr "重開錢包發生錯誤。資料可能流失。"
 
-#: misc/tdewalletd/tdewalletd.cpp:1242
+#: misc/tdewalletd/tdewalletd.cpp:1243
 msgid ""
 "There have been repeated failed attempts to gain access to a wallet. An "
 "application may be misbehaving."
diff --git a/tde-i18n-zh_TW/messages/tdelibs/tdelibs.po b/tde-i18n-zh_TW/messages/tdelibs/tdelibs.po
index a3a2760db5c..34d686b1b27 100644
--- a/tde-i18n-zh_TW/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-zh_TW/messages/tdelibs/tdelibs.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-01-13 18:39+0100\n"
+"POT-Creation-Date: 2019-01-23 23:08+0100\n"
 "PO-Revision-Date: 2007-09-18 14:32+0800\n"
 "Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
 "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
@@ -2312,7 +2312,7 @@ msgstr "標誌"
 msgid "Photo"
 msgstr "照片"
 
-#: tdeabc/addressee.cpp:948 tdecore/tdehw/tdehardwaredevices.cpp:4208
+#: tdeabc/addressee.cpp:948 tdecore/tdehw/tdehardwaredevices.cpp:4122
 msgid "Sound"
 msgstr "聲音"
 
@@ -2681,7 +2681,7 @@ msgstr "視訊"
 msgid "Mailbox"
 msgstr "信箱"
 
-#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4190
+#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4107
 msgid "Modem"
 msgstr "數據機"
 
@@ -4751,72 +4751,6 @@ msgstr ""
 msgid "No PSK provided"
 msgstr "沒有選擇供應者。"
 
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:51
-msgid "card not powered on"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:54
-msgid "protocol mismatch"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:274
-#, fuzzy
-msgid "Unknown (%1)"
-msgstr "無法識別"
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:323
-msgid "Please enter the PIN for '%1'"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:700
-#, fuzzy
-msgid "Card watcher object not available"
-msgstr "無法預覽。"
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:709
-msgid "Unable to initialize PKCS"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:715
-#, c-format
-msgid "Cannot enumerate certificates: %1"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:726
-#, fuzzy, c-format
-msgid "Cannot read certificate: %1"
-msgstr "不合法的憑證！"
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:736
-msgid "Cannot initialize openssl session to retrieve cryptographic objects"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:746
-msgid "Cannot get X509 object"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:794
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:804
-#, c-format
-msgid "Cannot decrypt: %1"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:794
-msgid "Ciphertext too small"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:804
-msgid "Ciphertext too large"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:815
-msgid "Cannot determine decrypted message length: %1 (%2)"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:836
-msgid "Cannot decrypt: %1 (%2)"
-msgstr ""
-
 #: tdecore/tdehw/tdeeventdevice.cpp:288
 msgid "Lid Switch"
 msgstr ""
@@ -4918,7 +4852,7 @@ msgid "Generic Input Device"
 msgstr "一般選項"
 
 #: tdecore/tdehw/tdegenericdevice.cpp:315
-#: tdecore/tdehw/tdehardwaredevices.cpp:3319
+#: tdecore/tdehw/tdehardwaredevices.cpp:3256
 msgid "Generic %1 Device"
 msgstr ""
 
@@ -4932,261 +4866,236 @@ msgid "Unknown Virtual Device"
 msgstr ""
 
 #: tdecore/tdehw/tdegenericdevice.cpp:330
-#: tdecore/tdehw/tdehardwaredevices.cpp:4307
+#: tdecore/tdehw/tdehardwaredevices.cpp:4206
 #, fuzzy
 msgid "Unknown Device"
 msgstr "無法辨識的欄位"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3324
+#: tdecore/tdehw/tdehardwaredevices.cpp:3261
 msgid "Disconnected %1 Port"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3714
-#: tdecore/tdehw/tdehardwaredevices.cpp:3794
-#: tdecore/tdehw/tdehardwaredevices.cpp:3806
+#: tdecore/tdehw/tdehardwaredevices.cpp:3631
+#: tdecore/tdehw/tdehardwaredevices.cpp:3711
+#: tdecore/tdehw/tdehardwaredevices.cpp:3723
 #, fuzzy
 msgid "Unknown PCI Device"
 msgstr "無法辨識的欄位"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3824
-#: tdecore/tdehw/tdehardwaredevices.cpp:3904
-#: tdecore/tdehw/tdehardwaredevices.cpp:3916
+#: tdecore/tdehw/tdehardwaredevices.cpp:3741
+#: tdecore/tdehw/tdehardwaredevices.cpp:3821
+#: tdecore/tdehw/tdehardwaredevices.cpp:3833
 #, fuzzy
 msgid "Unknown USB Device"
 msgstr "無法辨識的欄位"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3945
-#: tdecore/tdehw/tdehardwaredevices.cpp:3986
+#: tdecore/tdehw/tdehardwaredevices.cpp:3862
+#: tdecore/tdehw/tdehardwaredevices.cpp:3903
 #, fuzzy
 msgid "Unknown PNP Device"
 msgstr "無法辨識的欄位"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4015
-#: tdecore/tdehw/tdehardwaredevices.cpp:4056
+#: tdecore/tdehw/tdehardwaredevices.cpp:3932
+#: tdecore/tdehw/tdehardwaredevices.cpp:3973
 msgid "Unknown Monitor Device"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4145
+#: tdecore/tdehw/tdehardwaredevices.cpp:4062
 #, fuzzy
 msgid "Root"
 msgstr "NoCARoot"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4148
+#: tdecore/tdehw/tdehardwaredevices.cpp:4065
 #, fuzzy
 msgid "System Root"
 msgstr "系統選單"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4151
+#: tdecore/tdehw/tdehardwaredevices.cpp:4068
 msgid "CPU"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4154
+#: tdecore/tdehw/tdehardwaredevices.cpp:4071
 #, fuzzy
 msgid "Graphics Processor"
 msgstr "地理位置"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4157
+#: tdecore/tdehw/tdehardwaredevices.cpp:4074
 msgid "RAM"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4160
+#: tdecore/tdehw/tdehardwaredevices.cpp:4077
 msgid "Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4163
+#: tdecore/tdehw/tdehardwaredevices.cpp:4080
 msgid "I2C Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4166
+#: tdecore/tdehw/tdehardwaredevices.cpp:4083
 msgid "MDIO Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4169
+#: tdecore/tdehw/tdehardwaredevices.cpp:4086
 #, fuzzy
 msgid "Mainboard"
 msgstr "主工具列"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4172
+#: tdecore/tdehw/tdehardwaredevices.cpp:4089
 msgid "Disk"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4175
+#: tdecore/tdehw/tdehardwaredevices.cpp:4092
 msgid "SCSI"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4178
+#: tdecore/tdehw/tdehardwaredevices.cpp:4095
 msgid "Storage Controller"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4181
+#: tdecore/tdehw/tdehardwaredevices.cpp:4098
 msgid "Mouse"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4184
+#: tdecore/tdehw/tdehardwaredevices.cpp:4101
 msgid "Keyboard"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4187
+#: tdecore/tdehw/tdehardwaredevices.cpp:4104
 msgid "HID"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4193
+#: tdecore/tdehw/tdehardwaredevices.cpp:4110
 msgid "Monitor and Display"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4196
+#: tdecore/tdehw/tdehardwaredevices.cpp:4113
 msgid "Network"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4199
-msgid "Nonvolatile Memory"
-msgstr ""
-
 #: ../dependencies/tqt3/src/dialogs/qprintdialog.cpp:1033
-#: tdecore/tdehw/tdehardwaredevices.cpp:4202
+#: tdecore/tdehw/tdehardwaredevices.cpp:4116
 #, fuzzy
 msgid "Printer"
 msgstr "列印"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4205
+#: tdecore/tdehw/tdehardwaredevices.cpp:4119
 msgid "Scanner"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4211
+#: tdecore/tdehw/tdehardwaredevices.cpp:4125
 #, fuzzy
 msgid "Video Capture"
 msgstr "視訊工具列"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4214
+#: tdecore/tdehw/tdehardwaredevices.cpp:4128
 msgid "IEEE1394"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4217
+#: tdecore/tdehw/tdehardwaredevices.cpp:4131
 msgid "PCMCIA"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4220
+#: tdecore/tdehw/tdehardwaredevices.cpp:4134
 msgid "Camera"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4223
+#: tdecore/tdehw/tdehardwaredevices.cpp:4137
 #, fuzzy
 msgid "Text I/O"
 msgstr "只用文字"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4226
+#: tdecore/tdehw/tdehardwaredevices.cpp:4140
 msgid "Serial Communications Controller"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4229
+#: tdecore/tdehw/tdehardwaredevices.cpp:4143
 msgid "Parallel Port"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4232
+#: tdecore/tdehw/tdehardwaredevices.cpp:4146
 msgid "Peripheral"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4235
+#: tdecore/tdehw/tdehardwaredevices.cpp:4149
 #, fuzzy
 msgid "Backlight"
 msgstr "上一步"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4238
+#: tdecore/tdehw/tdehardwaredevices.cpp:4152
 msgid "Battery"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4241
+#: tdecore/tdehw/tdehardwaredevices.cpp:4155
 msgid "Power Supply"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4244
+#: tdecore/tdehw/tdehardwaredevices.cpp:4158
 #, fuzzy
 msgid "Docking Station"
 msgstr "方向"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4247
+#: tdecore/tdehw/tdehardwaredevices.cpp:4161
 #, fuzzy
 msgid "Thermal Sensor"
 msgstr "一般設定"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4250
+#: tdecore/tdehw/tdehardwaredevices.cpp:4164
 msgid "Thermal Control"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4253
+#: tdecore/tdehw/tdehardwaredevices.cpp:4167
 #: tdecore/tdehw/tdenetworkconnections.cpp:781
 msgid "Bluetooth"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4256
+#: tdecore/tdehw/tdehardwaredevices.cpp:4170
 msgid "Bridge"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4259
-msgid "Hub"
-msgstr ""
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4262
+#: tdecore/tdehw/tdehardwaredevices.cpp:4173
 msgid "Platform"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4265
+#: tdecore/tdehw/tdehardwaredevices.cpp:4176
 msgid "Cryptography"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4268
-msgid "Cryptographic Card"
-msgstr ""
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4271
-#, fuzzy
-msgid "Biometric Security"
-msgstr "安全性"
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4274
-msgid "Test and Measurement"
-msgstr ""
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4277
-msgid "Timekeeping"
-msgstr ""
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4280
+#: tdecore/tdehw/tdehardwaredevices.cpp:4179
 msgid "Platform Event"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4283
+#: tdecore/tdehw/tdehardwaredevices.cpp:4182
 #, fuzzy
 msgid "Platform Input"
 msgstr "清除輸入"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4286
+#: tdecore/tdehw/tdehardwaredevices.cpp:4185
 msgid "Plug and Play"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4289
+#: tdecore/tdehw/tdehardwaredevices.cpp:4188
 #, fuzzy
 msgid "Other ACPI"
 msgstr "其他"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4292
+#: tdecore/tdehw/tdehardwaredevices.cpp:4191
 #, fuzzy
 msgid "Other USB"
 msgstr "其他"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4295
+#: tdecore/tdehw/tdehardwaredevices.cpp:4194
 msgid "Other Multimedia"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4298
+#: tdecore/tdehw/tdehardwaredevices.cpp:4197
 msgid "Other Peripheral"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4301
+#: tdecore/tdehw/tdehardwaredevices.cpp:4200
 msgid "Other Sensor"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4304
+#: tdecore/tdehw/tdehardwaredevices.cpp:4203
 msgid "Other Virtual"
 msgstr ""
 
@@ -5234,109 +5143,94 @@ msgstr ""
 msgid "Virtual Private Network"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:279
-#, fuzzy
-msgid "Inactive"
-msgstr "相對"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:282
-#, fuzzy
-msgid "Active"
-msgstr "動作"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:285
-#: tdehtml/java/kjavaappletserver.cpp:667
-msgid "Unknown"
-msgstr "無法識別"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:761
+#: tdecore/tdehw/tdestoragedevice.cpp:540
 msgid "%1 Removable Device"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:764
+#: tdecore/tdehw/tdestoragedevice.cpp:543
 msgid "%1 Fixed Storage Device"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:781
-#: tdecore/tdehw/tdestoragedevice.cpp:816
+#: tdecore/tdehw/tdestoragedevice.cpp:560
+#: tdecore/tdehw/tdestoragedevice.cpp:595
 msgid "Hard Disk Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:785
+#: tdecore/tdehw/tdestoragedevice.cpp:564
 msgid "Floppy Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:788
+#: tdecore/tdehw/tdestoragedevice.cpp:567
 msgid "Optical Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:791
+#: tdecore/tdehw/tdestoragedevice.cpp:570
 msgid "CDROM Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:794
+#: tdecore/tdehw/tdestoragedevice.cpp:573
 msgid "CDRW Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:797
+#: tdecore/tdehw/tdestoragedevice.cpp:576
 msgid "DVD Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:800
+#: tdecore/tdehw/tdestoragedevice.cpp:579
 msgid "DVDRW Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:803
+#: tdecore/tdehw/tdestoragedevice.cpp:582
 msgid "DVDRAM Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:806
+#: tdecore/tdehw/tdestoragedevice.cpp:585
 msgid "Zip Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:809
+#: tdecore/tdehw/tdestoragedevice.cpp:588
 msgid "Tape Drive"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:812
+#: tdecore/tdehw/tdestoragedevice.cpp:591
 msgid "Digital Camera"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:818
+#: tdecore/tdehw/tdestoragedevice.cpp:597
 #, fuzzy
 msgid "Removable Storage"
 msgstr "移除項目"
 
-#: tdecore/tdehw/tdestoragedevice.cpp:821
+#: tdecore/tdehw/tdestoragedevice.cpp:600
 msgid "Compact Flash"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:824
+#: tdecore/tdehw/tdestoragedevice.cpp:603
 msgid "Memory Stick"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:827
+#: tdecore/tdehw/tdestoragedevice.cpp:606
 msgid "Smart Media"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:830
+#: tdecore/tdehw/tdestoragedevice.cpp:609
 #, fuzzy
 msgid "Secure Digital"
 msgstr "安全性"
 
-#: tdecore/tdehw/tdestoragedevice.cpp:835
+#: tdecore/tdehw/tdestoragedevice.cpp:614
 msgid "Random Access Memory"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:838
+#: tdecore/tdehw/tdestoragedevice.cpp:617
 msgid "Loop Device"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:1224
+#: tdecore/tdehw/tdestoragedevice.cpp:976
 msgid "No supported mounting methods were detected on your system"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:1411
+#: tdecore/tdehw/tdestoragedevice.cpp:1154
 msgid "No supported unmounting methods were detected on your system"
 msgstr ""
 
@@ -5920,6 +5814,10 @@ msgstr "個人密錀失敗"
 msgid "InvalidHost"
 msgstr "錯誤主機"
 
+#: tdehtml/java/kjavaappletserver.cpp:667
+msgid "Unknown"
+msgstr "無法識別"
+
 #: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6842
 msgid "Security Alert"
 msgstr "安全警報"
@@ -8808,23 +8706,23 @@ msgstr "下拉清單 && 短暫自動化"
 msgid "&Browse..."
 msgstr "瀏覽(&B)..."
 
-#: tdeui/kpassdlg.cpp:250
+#: tdeui/kpassdlg.cpp:255
 msgid "&Password:"
 msgstr "密碼(&P)："
 
-#: tdeui/kpassdlg.cpp:269
+#: tdeui/kpassdlg.cpp:274
 msgid "&Keep password"
 msgstr "保存密碼(&K)"
 
-#: tdeui/kpassdlg.cpp:289
+#: tdeui/kpassdlg.cpp:294
 msgid "&Verify:"
 msgstr "確認(&V)："
 
-#: tdeui/kpassdlg.cpp:311
+#: tdeui/kpassdlg.cpp:316
 msgid "Password strength meter:"
 msgstr "密碼安全測量器："
 
-#: tdeui/kpassdlg.cpp:315
+#: tdeui/kpassdlg.cpp:320
 msgid ""
 "The password strength meter gives an indication of the security of the "
 "password you have entered.  To improve the strength of the password, try:\n"
@@ -8837,15 +8735,15 @@ msgstr ""
 " - 混合使用大寫和小寫字母；\n"
 " - 混合數字或符號，如：#。"
 
-#: tdeui/kpassdlg.cpp:331 tdeui/kpassdlg.cpp:524
+#: tdeui/kpassdlg.cpp:336 tdeui/kpassdlg.cpp:530
 msgid "Passwords do not match"
 msgstr "密碼不同"
 
-#: tdeui/kpassdlg.cpp:408
+#: tdeui/kpassdlg.cpp:413
 msgid "You entered two different passwords. Please try again."
 msgstr "您輸入了兩個不同的密碼。請重新輸入。"
 
-#: tdeui/kpassdlg.cpp:415
+#: tdeui/kpassdlg.cpp:420
 msgid ""
 "The password you have entered has a low strength. To improve the strength of "
 "the password, try:\n"
@@ -8860,22 +8758,22 @@ msgstr ""
 " - 混合使用大寫和小寫字母；\n"
 " - 混合數字或符號，如：#。"
 
-#: tdeui/kpassdlg.cpp:423
+#: tdeui/kpassdlg.cpp:428
 msgid "Low Password Strength"
 msgstr "密碼不夠安全"
 
-#: tdeui/kpassdlg.cpp:518
+#: tdeui/kpassdlg.cpp:524
 msgid "Password is empty"
 msgstr "密碼是空白的"
 
-#: tdeui/kpassdlg.cpp:521
+#: tdeui/kpassdlg.cpp:527
 #, c-format
 msgid ""
 "_n: Password must be at least 1 character long\n"
 "Password must be at least %n characters long"
 msgstr "密碼最少要有 %n 個字元"
 
-#: tdeui/kpassdlg.cpp:523
+#: tdeui/kpassdlg.cpp:529
 msgid "Passwords match"
 msgstr "密碼相同"
 
@@ -13383,6 +13281,30 @@ msgstr "密碼是空白的"
 msgid "The size of the dialog"
 msgstr "每日小祕訣"
 
+#, fuzzy
+#~ msgid "Unknown (%1)"
+#~ msgstr "無法識別"
+
+#, fuzzy
+#~ msgid "Card watcher object not available"
+#~ msgstr "無法預覽。"
+
+#, fuzzy
+#~ msgid "Cannot read certificate: %1"
+#~ msgstr "不合法的憑證！"
+
+#, fuzzy
+#~ msgid "Biometric Security"
+#~ msgstr "安全性"
+
+#, fuzzy
+#~ msgid "Inactive"
+#~ msgstr "相對"
+
+#, fuzzy
+#~ msgid "Active"
+#~ msgstr "動作"
+
 #~ msgid ""
 #~ "The <b>K Desktop Environment</b> is written and maintained by the TDE "
 #~ "Team, a world-wide network of software engineers committed to <a href="