3 files changed, 285 insertions, 368 deletions
diff --git a/tde-i18n-ja/messages/tdelibs/katepart.po b/tde-i18n-ja/messages/tdelibs/katepart.po
index 3cdceaa1c4a..ebe7dcb53e6 100644
--- a/tde-i18n-ja/messages/tdelibs/katepart.po
+++ b/tde-i18n-ja/messages/tdelibs/katepart.po
@@ -13,7 +13,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: 2007-10-28 16:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -637,14 +637,14 @@ msgstr "作成日時で(&R)"
 msgid "Show indentation lines"
 msgstr "字下げを示す線を表示する(&N)"
 
-#: 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 "動的な行の折り返しマーカーを表示すべき場合を選択してください。"
 
@@ -1278,7 +1278,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 "ファイルを保存"
 
@@ -1306,16 +1306,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)"
 
@@ -2523,79 +2523,66 @@ 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 "このボタンを押すと現在選択されているエンティティを削除します。"
-
 # ACCELERATOR added by translator
-#: part/kateview.cpp:291
+#: part/kateview.cpp:287
 msgid "Join Lines"
 msgstr "行を結合(&J)"
 
-#: 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."
@@ -2603,79 +2590,79 @@ 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 "折りたたみマーカーを表示(&M)"
 
-#: part/kateview.cpp:381
+#: part/kateview.cpp:376
 msgid ""
 "You can choose if the codefolding marks should be shown, if codefolding is "
 "possible."
@@ -2683,15 +2670,15 @@ 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."
@@ -2699,27 +2686,27 @@ 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."
@@ -2727,15 +2714,15 @@ 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"
@@ -2743,237 +2730,241 @@ 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 "1 ページ前にスクロール"
 
-#: part/kateview.cpp:543
+#: part/kateview.cpp:538
 msgid "Select Page Up"
 msgstr "1 ページ前まで選択"
 
-#: 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 "1 ページ後ろにスクロール"
 
-#: part/kateview.cpp:560
+#: part/kateview.cpp:555
 msgid "Select Page Down"
 msgstr "1 ページ後ろまで選択"
 
-#: 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 " R/O "
 
-#: 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 " BLK "
 
-#: 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 としてエクスポート"
 
@@ -5205,6 +5196,10 @@ msgid ""
 msgstr "Bash"
 
 #, fuzzy
+#~ msgid "Use this to delete the current line."
+#~ msgstr "このボタンを押すと現在選択されているエンティティを削除します。"
+
+#, fuzzy
 #~ msgid "&Bookmarks"
 #~ msgstr "ブックマーク"
 
diff --git a/tde-i18n-ja/messages/tdelibs/tdeio.po b/tde-i18n-ja/messages/tdelibs/tdeio.po
index 04d703e747f..96c41c09afa 100644
--- a/tde-i18n-ja/messages/tdelibs/tdeio.po
+++ b/tde-i18n-ja/messages/tdelibs/tdeio.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tdeio\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
 "PO-Revision-Date: 2007-10-24 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -337,11 +337,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 で保護されていないため安全ではありません。"
 
@@ -364,102 +364,102 @@ 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 bit 暗号のうち %1 bit が使用されています"
 
-#: 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 "Eメール:"
 
@@ -495,23 +495,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 サポートがありません。"
 
@@ -781,13 +781,13 @@ 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)"
@@ -795,12 +795,12 @@ 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>'."
@@ -808,7 +808,7 @@ 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."
@@ -816,19 +816,19 @@ 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-ja/messages/tdelibs/tdelibs.po b/tde-i18n-ja/messages/tdelibs/tdelibs.po
index 8604dfbd881..4476d74f6a6 100644
--- a/tde-i18n-ja/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-ja/messages/tdelibs/tdelibs.po
@@ -11,7 +11,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-08-28 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -2323,7 +2323,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 "サウンド"
 
@@ -2697,7 +2697,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 "モデム"
 
@@ -4761,72 +4761,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 ""
@@ -4928,7 +4862,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 ""
 
@@ -4942,261 +4876,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 ""
 
@@ -5244,109 +5153,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 ""
 
@@ -5934,6 +5828,10 @@ msgstr "PrivateKeyFailed"
 msgid "InvalidHost"
 msgstr "InvalidHost"
 
+#: tdehtml/java/kjavaappletserver.cpp:667
+msgid "Unknown"
+msgstr "不明"
+
 #: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6842
 msgid "Security Alert"
 msgstr "セキュリティの注意"
@@ -8879,23 +8777,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"
@@ -8909,15 +8807,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"
@@ -8934,22 +8832,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 "パスワードが一致しました"
 
@@ -13522,6 +13420,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="