Merge translation files from master branch.

3 files changed, 286 insertions, 368 deletions

diff --git a/tde-i18n-af/messages/tdelibs/katepart.po b/tde-i18n-af/messages/tdelibs/katepart.po
index 5ae41bc1239..e30586c2ba0 100644
--- a/tde-i18n-af/messages/tdelibs/katepart.po
+++ b/tde-i18n-af/messages/tdelibs/katepart.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katepart stable\n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
 "PO-Revision-Date: 2005-11-25 11:24+0200\n"
 "Last-Translator: Juanita Franz <juanita.franz@vr-web.de>\n"
 "Language-Team: AFRIKAANS <translate-discuss-af@lists.sourceforge.net>\n"
@@ -633,7 +633,7 @@ msgstr "Deur skep"
 msgid "Show indentation lines"
 msgstr "Vertoon inkeping Reëls"
 
-#: 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."
@@ -641,7 +641,7 @@ msgstr ""
 "As hierdie opsie is nagegaan, die teks lyne sal wees oorvloei na die "
 "besigtig grens op die skerm."
 
-#: 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 "Kies wanneer die Dinamiese Woord Oorvloei Indikators vertoon moet word"
 
@@ -1295,7 +1295,7 @@ msgstr ""
 msgid "Close Nevertheless"
 msgstr "Maak nogsteeds toe"
 
-#: 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 "Stoor Lêer"
 
@@ -1323,18 +1323,18 @@ msgstr "Die lêer '%1' is gemaak deur 'n ander program."
 msgid "The file '%1' was deleted by another program."
 msgstr "Die lêer '%1' was uitgevee deur 'n ander program."
 
-#: 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 ""
 "'n lêer genaamd \"%1\" alreeds bestaan. Word jy seker jy wil hê na oorskryf "
 "dit?"
 
-#: part/katedocument.cpp:5103 part/kateview.cpp:896
+#: part/katedocument.cpp:5103 part/kateview.cpp:891
 msgid "Overwrite File?"
 msgstr "Oorskryf Lêer?"
 
-#: part/katedocument.cpp:5104 part/kateview.cpp:897
+#: part/katedocument.cpp:5104 part/kateview.cpp:892
 msgid "&Overwrite"
 msgstr "Oorskryf"
 
@@ -2574,40 +2574,27 @@ msgstr ""
 "Kapitaliseer die verkose deel, of die woord onder die plekwyser as geen teks "
 "gekies is nie."
 
-#: part/kateview.cpp:287 part/kateview.cpp:589
-msgid "Delete Line"
-msgstr "Uitvee Lyn"
-
-#: part/kateview.cpp:289
-#, fuzzy
-msgid "Use this to delete the current line."
-msgstr "Druk hierdie knoppie die huidiglik gekose teks te verwyder klipbord."
-
-#: part/kateview.cpp:291
+#: part/kateview.cpp:287
 msgid "Join Lines"
 msgstr "Verbind Lyne"
 
-#: 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 "Druk die huidige dokument."
 
-#: part/kateview.cpp:306
+#: part/kateview.cpp:301
 msgid "Reloa&d"
 msgstr "Herlaai"
 
-#: part/kateview.cpp:307
+#: part/kateview.cpp:302
 msgid "Reload the current document from disk."
 msgstr "Herlaai die huidige dokument van disket."
 
-#: part/kateview.cpp:310
+#: part/kateview.cpp:305
 msgid "Save the current document to disk, with a name of your choice."
 msgstr "Stoor die huidige dokument na disket, met 'n naam van jou keuse."
 
-#: 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."
@@ -2615,39 +2602,39 @@ msgstr ""
 "Hierdie opdrag maak oop 'n dialoog en laat jy jy kies 'n lyn wat jy wil hê "
 "die plekaanduier na beweeg na."
 
-#: part/kateview.cpp:315
+#: part/kateview.cpp:310
 msgid "&Configure Editor..."
 msgstr "Konfigureer Redigeerder..."
 
-#: part/kateview.cpp:316
+#: part/kateview.cpp:311
 msgid "Configure various aspects of this editor."
 msgstr "Konfigureer verskeie aspekte van hierdie redigeerder."
 
-#: part/kateview.cpp:318
+#: part/kateview.cpp:313
 msgid "&Highlighting"
 msgstr "Verligting"
 
-#: part/kateview.cpp:319
+#: part/kateview.cpp:314
 msgid "Here you can choose how the current document should be highlighted."
 msgstr "Hier jy kan kies hoe die huidige dokument moet wees verlig."
 
-#: part/kateview.cpp:322
+#: part/kateview.cpp:317
 msgid "&Filetype"
 msgstr "Lêertipe"
 
-#: part/kateview.cpp:325
+#: part/kateview.cpp:320
 msgid "&Schema"
 msgstr "Skema"
 
-#: part/kateview.cpp:329
+#: part/kateview.cpp:324
 msgid "&Indentation"
 msgstr "Inkeping"
 
-#: part/kateview.cpp:332
+#: part/kateview.cpp:327
 msgid "E&xport as HTML..."
 msgstr "Uitvoer as Html..."
 
-#: 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."
@@ -2655,11 +2642,11 @@ msgstr ""
 "Hierdie opdrag laat jou toe om uit te voer die huidige dokument met alle "
 "verligting informasie binne in 'n Html dokument."
 
-#: part/kateview.cpp:337
+#: part/kateview.cpp:332
 msgid "Select the entire text of the current document."
 msgstr "Kies die hele teks van die huidige dokument."
 
-#: part/kateview.cpp:340
+#: part/kateview.cpp:335
 msgid ""
 "If you have selected something within the current document, this will no "
 "longer be selected."
@@ -2667,27 +2654,27 @@ msgstr ""
 "As jy het gekose iets binne in die huidige dokument, hierdie sal nee langer "
 "wees gekose."
 
-#: part/kateview.cpp:342
+#: part/kateview.cpp:337
 msgid "Enlarge Font"
 msgstr "Vergroot skriftipe"
 
-#: part/kateview.cpp:343
+#: part/kateview.cpp:338
 msgid "This increases the display font size."
 msgstr "Hierdie vermeerder die grootte van die vertoonde teks."
 
-#: part/kateview.cpp:345
+#: part/kateview.cpp:340
 msgid "Shrink Font"
 msgstr "Verklein skriftipe"
 
-#: part/kateview.cpp:346
+#: part/kateview.cpp:341
 msgid "This decreases the display font size."
 msgstr "Hierdie verklein die grootte van die vertoonde teks."
 
-#: part/kateview.cpp:349
+#: part/kateview.cpp:344
 msgid "Bl&ock Selection Mode"
 msgstr "Blok Keuse Module"
 
-#: 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."
@@ -2695,11 +2682,11 @@ msgstr ""
 "Hierdie opdrag laat toe omskakeling tussen die normale (lyn gebaseerde) "
 "keuse modus en die blok keuse modus."
 
-#: part/kateview.cpp:355
+#: part/kateview.cpp:350
 msgid "Overwr&ite Mode"
 msgstr "Oorskryf Modus"
 
-#: 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."
@@ -2707,31 +2694,31 @@ msgstr ""
 "Kies hetsy jy wil hê die teks jy tipe na wees ingesit of na oorskryf "
 "bestaande teks."
 
-#: part/kateview.cpp:362
+#: part/kateview.cpp:357
 msgid "&Dynamic Word Wrap"
 msgstr "Dinamiese Woord Oorvloei"
 
-#: part/kateview.cpp:367
+#: part/kateview.cpp:362
 msgid "Dynamic Word Wrap Indicators"
 msgstr "Dinamiese Woord Oorvloei Inkepings"
 
-#: part/kateview.cpp:372
+#: part/kateview.cpp:367
 msgid "&Off"
 msgstr "Af"
 
-#: part/kateview.cpp:373
+#: part/kateview.cpp:368
 msgid "Follow &Line Numbers"
 msgstr "Volg Lyn Nommers"
 
-#: part/kateview.cpp:374
+#: part/kateview.cpp:369
 msgid "&Always On"
 msgstr "Altyd Aan"
 
-#: part/kateview.cpp:378
+#: part/kateview.cpp:373
 msgid "Show Folding &Markers"
 msgstr "Vertoon Vou en Merkers"
 
-#: part/kateview.cpp:381
+#: part/kateview.cpp:376
 msgid ""
 "You can choose if the codefolding marks should be shown, if codefolding is "
 "possible."
@@ -2739,15 +2726,15 @@ msgstr ""
 "Jy kan kies of die kodevou merkers getoon moet word, indien kodevouing "
 "moontlik is."
 
-#: part/kateview.cpp:382
+#: part/kateview.cpp:377
 msgid "Hide Folding &Markers"
 msgstr "Versteek Vou en Merkers"
 
-#: part/kateview.cpp:385
+#: part/kateview.cpp:380
 msgid "Show &Icon Border"
 msgstr "Vertoon Ikoon Grens"
 
-#: part/kateview.cpp:389
+#: part/kateview.cpp:384
 msgid ""
 "Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, "
 "for instance."
@@ -2755,28 +2742,28 @@ msgstr ""
 "Vertoon/steek weg die ikoon grens.<BR><BR> die ikoon grens vertoon boekmerk "
 "simbole, vir voorbeeld."
 
-#: part/kateview.cpp:390
+#: part/kateview.cpp:385
 msgid "Hide &Icon Border"
 msgstr "Wegsteek Ikoon Grens"
 
-#: part/kateview.cpp:393
+#: part/kateview.cpp:388
 msgid "Show &Line Numbers"
 msgstr "Vertoon Lyn Nommers"
 
-#: part/kateview.cpp:396
+#: part/kateview.cpp:391
 msgid "Show/hide the line numbers on the left hand side of the view."
 msgstr ""
 "Vertoon/steek weg die lyn nommers op die links hand kant van die besigtig."
 
-#: part/kateview.cpp:397
+#: part/kateview.cpp:392
 msgid "Hide &Line Numbers"
 msgstr "Wegsteek Lyn Nommers"
 
-#: part/kateview.cpp:400
+#: part/kateview.cpp:395
 msgid "Show Scroll&bar Marks"
 msgstr "Wys Rolstaaf Merke"
 
-#: 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."
@@ -2784,15 +2771,15 @@ msgstr ""
 "Vertoon/steekweg die merke op die vertikale rolstaaf.<BR><BR>Die merke, "
 "byvoorbeeld, wys boekmerke."
 
-#: part/kateview.cpp:404
+#: part/kateview.cpp:399
 msgid "Hide Scroll&bar Marks"
 msgstr "Wegsteek rolstaaf merke"
 
-#: part/kateview.cpp:407
+#: part/kateview.cpp:402
 msgid "Show Static &Word Wrap Marker"
 msgstr "Wys Statiese Woord Oorvloei Merker"
 
-#: 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"
@@ -2800,238 +2787,242 @@ msgstr ""
 "Vertoon/Versteek die Woord Oorvloei Merker,'n vertikale lyn getrek by die "
 "woord oorvloei kolom soos gedefinieerd in die redigeerde eienskappe"
 
-#: part/kateview.cpp:413
+#: part/kateview.cpp:408
 msgid "Hide Static &Word Wrap Marker"
 msgstr "Wegsteek Statiese Woord Oorvloei Merker"
 
-#: part/kateview.cpp:416
+#: part/kateview.cpp:411
 msgid "Switch to Command Line"
 msgstr "Verander na Opdrag Lyn"
 
-#: part/kateview.cpp:419
+#: part/kateview.cpp:414
 msgid "Show/hide the command line on the bottom of the view."
 msgstr "Vertoon/steekweg die opdrag lyn op die onderkant van die besigtig."
 
-#: part/kateview.cpp:421
+#: part/kateview.cpp:416
 msgid "&End of Line"
 msgstr "Einde van Lyn"
 
-#: part/kateview.cpp:422
+#: part/kateview.cpp:417
 msgid "Choose which line endings should be used, when you save the document"
 msgstr ""
 "Kies watter lyn eindiging gebruik moet word, wanneer jy die dokument stoor"
 
-#: part/kateview.cpp:432
+#: part/kateview.cpp:427
 msgid "E&ncoding"
 msgstr "Enkodering"
 
-#: part/kateview.cpp:449
+#: part/kateview.cpp:444
 msgid "Move Word Left"
 msgstr "Beweeg Woord Links"
 
-#: part/kateview.cpp:453
+#: part/kateview.cpp:448
 msgid "Select Character Left"
 msgstr "Kies Karakter Links"
 
-#: part/kateview.cpp:457
+#: part/kateview.cpp:452
 msgid "Select Word Left"
 msgstr "Kies Woord Links"
 
-#: part/kateview.cpp:462
+#: part/kateview.cpp:457
 msgid "Move Word Right"
 msgstr "Beweeg Woord Regterkant"
 
-#: part/kateview.cpp:466
+#: part/kateview.cpp:461
 msgid "Select Character Right"
 msgstr "Kies Karakter Regterkant"
 
-#: part/kateview.cpp:470
+#: part/kateview.cpp:465
 msgid "Select Word Right"
 msgstr "Kies Woord Regterkant"
 
-#: part/kateview.cpp:475
+#: part/kateview.cpp:470
 msgid "Move to Beginning of Line"
 msgstr "Beweeg na Begin van Lyn"
 
-#: part/kateview.cpp:479
+#: part/kateview.cpp:474
 msgid "Move to Beginning of Document"
 msgstr "Beweeg na Begin van Dokument"
 
-#: part/kateview.cpp:483
+#: part/kateview.cpp:478
 msgid "Select to Beginning of Line"
 msgstr "Kies na Begin van Lyn"
 
-#: part/kateview.cpp:487
+#: part/kateview.cpp:482
 msgid "Select to Beginning of Document"
 msgstr "Kies na Begin van Dokument"
 
-#: part/kateview.cpp:492
+#: part/kateview.cpp:487
 msgid "Move to End of Line"
 msgstr "Beweeg na Einde van Lyn"
 
-#: part/kateview.cpp:496
+#: part/kateview.cpp:491
 msgid "Move to End of Document"
 msgstr "Beweeg na Einde van Dokument"
 
-#: part/kateview.cpp:500
+#: part/kateview.cpp:495
 msgid "Select to End of Line"
 msgstr "Kies na Einde van Lyn"
 
-#: part/kateview.cpp:504
+#: part/kateview.cpp:499
 msgid "Select to End of Document"
 msgstr "Kies na Einde van Dokument"
 
-#: part/kateview.cpp:509
+#: part/kateview.cpp:504
 msgid "Select to Previous Line"
 msgstr "Kies na Vorige Lyn"
 
-#: part/kateview.cpp:513
+#: part/kateview.cpp:508
 msgid "Scroll Line Up"
 msgstr "Rol Lyn Begin"
 
-#: part/kateview.cpp:517
+#: part/kateview.cpp:512
 msgid "Move to Next Line"
 msgstr "Beweeg na Volgende Lyn"
 
-#: part/kateview.cpp:520
+#: part/kateview.cpp:515
 msgid "Move to Previous Line"
 msgstr "Beweeg na Vorige Lyn"
 
-#: part/kateview.cpp:523
+#: part/kateview.cpp:518
 msgid "Move Character Right"
 msgstr "Beweeg Karakter Regterkant"
 
-#: part/kateview.cpp:526
+#: part/kateview.cpp:521
 msgid "Move Character Left"
 msgstr "Beweeg Karakter Links"
 
-#: part/kateview.cpp:530
+#: part/kateview.cpp:525
 msgid "Select to Next Line"
 msgstr "Kies na Volgende Lyn"
 
-#: part/kateview.cpp:534
+#: part/kateview.cpp:529
 msgid "Scroll Line Down"
 msgstr "Rol Lyn Ondertoe"
 
-#: part/kateview.cpp:539
+#: part/kateview.cpp:534
 msgid "Scroll Page Up"
 msgstr "Rol Bladsy Begin"
 
-#: part/kateview.cpp:543
+#: part/kateview.cpp:538
 msgid "Select Page Up"
 msgstr "Kies Bladsy Begin"
 
-#: part/kateview.cpp:547
+#: part/kateview.cpp:542
 msgid "Move to Top of View"
 msgstr "Beweeg na Bo van Besigtig"
 
-#: part/kateview.cpp:551
+#: part/kateview.cpp:546
 msgid "Select to Top of View"
 msgstr "Kies na Bo van Besigtig"
 
-#: part/kateview.cpp:556
+#: part/kateview.cpp:551
 msgid "Scroll Page Down"
 msgstr "Rol Bladsy Ondertoe"
 
-#: part/kateview.cpp:560
+#: part/kateview.cpp:555
 msgid "Select Page Down"
 msgstr "Kies Bladsy Ondertoe"
 
-#: part/kateview.cpp:564
+#: part/kateview.cpp:559
 msgid "Move to Bottom of View"
 msgstr "Beweeg na Bodem van Besigtig"
 
-#: part/kateview.cpp:568
+#: part/kateview.cpp:563
 msgid "Select to Bottom of View"
 msgstr "Kies na Bodem van Besigtig"
 
-#: part/kateview.cpp:572
+#: part/kateview.cpp:567
 msgid "Move to Matching Bracket"
 msgstr "Beweeg na Ooreenstemmende Hakkie"
 
-#: part/kateview.cpp:576
+#: part/kateview.cpp:571
 msgid "Select to Matching Bracket"
 msgstr "Kies na Ooreenstemmende Hakkie"
 
-#: part/kateview.cpp:584
+#: part/kateview.cpp:579
 msgid "Transpose Characters"
 msgstr "Oordraende Karakters"
 
-#: part/kateview.cpp:594
+#: part/kateview.cpp:584
+msgid "Delete Line"
+msgstr "Uitvee Lyn"
+
+#: part/kateview.cpp:589
 msgid "Delete Word Left"
 msgstr "Uitvee Woord Links"
 
-#: part/kateview.cpp:599
+#: part/kateview.cpp:594
 msgid "Delete Word Right"
 msgstr "Uitvee Woord Regterkant"
 
-#: part/kateview.cpp:603
+#: part/kateview.cpp:598
 msgid "Delete Next Character"
 msgstr "Verwyder Volgende Karakter"
 
-#: part/kateview.cpp:607
+#: part/kateview.cpp:602
 msgid "Backspace"
 msgstr "Terugruimte"
 
-#: part/kateview.cpp:633
+#: part/kateview.cpp:628
 msgid "Collapse Toplevel"
 msgstr "Saambreek Boonstevlak"
 
-#: part/kateview.cpp:635
+#: part/kateview.cpp:630
 msgid "Expand Toplevel"
 msgstr "Uitbrei Boonste Vlak"
 
-#: part/kateview.cpp:637
+#: part/kateview.cpp:632
 msgid "Collapse One Local Level"
 msgstr "Saambreek een Lokale Vlak"
 
-#: part/kateview.cpp:639
+#: part/kateview.cpp:634
 msgid "Expand One Local Level"
 msgstr "UItbrei Een Lokale Vlak"
 
-#: part/kateview.cpp:644
+#: part/kateview.cpp:639
 msgid "Show the code folding region tree"
 msgstr "Wys die kode vou area boom"
 
-#: part/kateview.cpp:645
+#: part/kateview.cpp:640
 msgid "Basic template code test"
 msgstr "Basiese sjabloon kode toets"
 
-#: part/kateview.cpp:707
+#: part/kateview.cpp:702
 msgid " OVR "
 msgstr " Ovr "
 
-#: part/kateview.cpp:709
+#: part/kateview.cpp:704
 msgid " INS "
 msgstr " Byvoeg "
 
-#: 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 "Lyn: %1"
 
-#: part/kateview.cpp:718
+#: part/kateview.cpp:713
 #, c-format
 msgid " Col: %1"
 msgstr "Kolom: %1"
 
-#: part/kateview.cpp:721
+#: part/kateview.cpp:716
 msgid " BLK "
 msgstr " Blk "
 
-#: part/kateview.cpp:721
+#: part/kateview.cpp:716
 msgid " NORM "
 msgstr "Norm"
 
-#: part/kateview.cpp:897
+#: part/kateview.cpp:892
 msgid "Overwrite the file"
 msgstr "Oorskryf die lêer"
 
-#: part/kateview.cpp:1799
+#: part/kateview.cpp:1794
 msgid "Export File as HTML"
 msgstr "Voer uit Lêer as HTML"
 
@@ -5264,6 +5255,11 @@ msgid ""
 msgstr "Bash"
 
 #, fuzzy
+#~ msgid "Use this to delete the current line."
+#~ msgstr ""
+#~ "Druk hierdie knoppie die huidiglik gekose teks te verwyder klipbord."
+
+#, fuzzy
 #~ msgid "&Bookmarks"
 #~ msgstr "Boekmerk"
 
diff --git a/tde-i18n-af/messages/tdelibs/tdeio.po b/tde-i18n-af/messages/tdelibs/tdeio.po
index c31504f3ebc..a6c19c0f1a1 100644
--- a/tde-i18n-af/messages/tdelibs/tdeio.po
+++ b/tde-i18n-af/messages/tdelibs/tdeio.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio stable\n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
 "PO-Revision-Date: 2005-11-25 05:33+0200\n"
 "Last-Translator: Juanita Franz <juanita.franz@vr-web.de>\n"
 "Language-Team: AFRIKAANS <translate-discuss-af@lists.sourceforge.net>\n"
@@ -331,11 +331,11 @@ msgstr "Die sertifikaat is nie relevant nie."
 msgid "The certificate is invalid."
 msgstr "Die sertifikaat is ongeldige."
 
-#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:151
+#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:149
 msgid "Current connection is secured with SSL."
 msgstr "Huidige verbinding is beveilig met 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 "Huidige verbinding is nie beveilig met Ssl."
 
@@ -358,102 +358,102 @@ msgstr ""
 "Die hoof deel van hierdie dokument is beveilig met Ssl, maar sommige dele "
 "word nie."
 
-#: kssl/ksslinfodlg.cc:145
+#: kssl/ksslinfodlg.cc:144
 msgid "Some of this document is secured with SSL, but the main part is not."
 msgstr ""
 "Sommige van hierdie dokument is beveilig met Ssl, maar die hoof deel is nie."
 
-#: kssl/ksslinfodlg.cc:188
+#: kssl/ksslinfodlg.cc:184
 msgid "Chain:"
 msgstr "Ketting:"
 
-#: kssl/ksslinfodlg.cc:197
+#: kssl/ksslinfodlg.cc:193
 msgid "0 - Site Certificate"
 msgstr "0 - Tuiste Sertifikaat"
 
-#: kssl/ksslinfodlg.cc:214
+#: kssl/ksslinfodlg.cc:210
 msgid "Peer certificate:"
 msgstr "Ouer sertifikaat:"
 
-#: kssl/ksslinfodlg.cc:216
+#: kssl/ksslinfodlg.cc:212
 msgid "Issuer:"
 msgstr "Uitreiker:"
 
-#: kssl/ksslinfodlg.cc:222
+#: kssl/ksslinfodlg.cc:218
 msgid "IP address:"
 msgstr " ip  adres:"
 
-#: 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 "Sertifikaat staat:"
 
-#: kssl/ksslinfodlg.cc:240
+#: kssl/ksslinfodlg.cc:236
 msgid "Valid from:"
 msgstr "Geldige van:"
 
-#: kssl/ksslinfodlg.cc:242
+#: kssl/ksslinfodlg.cc:238
 msgid "Valid until:"
 msgstr "Geldige totdat:"
 
-#: kssl/ksslinfodlg.cc:245
+#: kssl/ksslinfodlg.cc:241
 msgid "Serial number:"
 msgstr "Reeksnommer nommer:"
 
-#: kssl/ksslinfodlg.cc:247
+#: kssl/ksslinfodlg.cc:243
 msgid "MD5 digest:"
 msgstr "Md5 opsomming:"
 
-#: kssl/ksslinfodlg.cc:250
+#: kssl/ksslinfodlg.cc:246
 msgid "Cipher in use:"
 msgstr "Cipher in gebruik:"
 
-#: kssl/ksslinfodlg.cc:252
+#: kssl/ksslinfodlg.cc:248
 msgid "Details:"
 msgstr "Details:"
 
-#: kssl/ksslinfodlg.cc:254
+#: kssl/ksslinfodlg.cc:250
 msgid "SSL version:"
 msgstr "Ssl weergawe:"
 
-#: kssl/ksslinfodlg.cc:256
+#: kssl/ksslinfodlg.cc:252
 msgid "Cipher strength:"
 msgstr "Cipher sterkte:"
 
-#: kssl/ksslinfodlg.cc:257
+#: kssl/ksslinfodlg.cc:253
 msgid "%1 bits used of a %2 bit cipher"
 msgstr "%1 bisse gebruik word van 'n %2  bit  cipher"
 
-#: kssl/ksslinfodlg.cc:413
+#: kssl/ksslinfodlg.cc:409
 msgid "Organization:"
 msgstr "Organisasie:"
 
-#: kssl/ksslinfodlg.cc:418
+#: kssl/ksslinfodlg.cc:414
 msgid "Organizational unit:"
 msgstr "Organisasie eenheid:"
 
-#: kssl/ksslinfodlg.cc:423
+#: kssl/ksslinfodlg.cc:419
 msgid "Locality:"
 msgstr "Plaaslikheid:"
 
-#: kssl/ksslinfodlg.cc:428
+#: kssl/ksslinfodlg.cc:424
 msgid ""
 "_: Federal State\n"
 "State:"
 msgstr "Staat:"
 
-#: kssl/ksslinfodlg.cc:433
+#: kssl/ksslinfodlg.cc:429
 msgid "Country:"
 msgstr "Land:"
 
-#: kssl/ksslinfodlg.cc:438
+#: kssl/ksslinfodlg.cc:434
 msgid "Common name:"
 msgstr "Gemeenskaplike naam:"
 
-#: kssl/ksslinfodlg.cc:443
+#: kssl/ksslinfodlg.cc:439
 msgid "Email:"
 msgstr "E-pos:"
 
@@ -489,23 +489,23 @@ msgstr "Stoor"
 msgid "Do Not Store"
 msgstr "Kon nie stoor"
 
-#: kssl/ksslkeygen.cc:209
+#: kssl/ksslkeygen.cc:210
 msgid "2048 (High Grade)"
 msgstr "2048 (Hoë Graad)"
 
-#: kssl/ksslkeygen.cc:210
+#: kssl/ksslkeygen.cc:211
 msgid "1024 (Medium Grade)"
 msgstr "1024 (Medium Graad)"
 
-#: kssl/ksslkeygen.cc:211
+#: kssl/ksslkeygen.cc:212
 msgid "768  (Low Grade)"
 msgstr "768 (Lae Graad)"
 
-#: kssl/ksslkeygen.cc:212
+#: kssl/ksslkeygen.cc:213
 msgid "512  (Low Grade)"
 msgstr "512 (Lae Graad)"
 
-#: kssl/ksslkeygen.cc:214
+#: kssl/ksslkeygen.cc:215
 msgid "No SSL support."
 msgstr "Nee Ssl ondersteun."
 
@@ -780,13 +780,13 @@ msgstr ""
 msgid "C&reate"
 msgstr "Skep"
 
-#: 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 Beursie Diens"
 
-#: 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)"
@@ -794,11 +794,11 @@ msgstr ""
 "<qt>'n Fout het voorgekom met die oopmaak van beursie '<b>%1</b>'. Probeer "
 "asseblief weer. <br>(Error code %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 het toegang gevra na die oop beurse  '<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>'."
@@ -806,7 +806,7 @@ msgstr ""
 "<qt>Die program '<b>%1</b>' het toegang versoek na die oop beursie '<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."
@@ -814,21 +814,21 @@ msgstr ""
 "Kon nie die beursie oopmaak nie. Die beursie moet eers oopgemaak word "
 "voordat die wagwoord verander kan word."
 
-#: 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>Kies asb. 'n nuwe wagwoord vir beursie: '<b>%1</b>'."
 
-#: misc/tdewalletd/tdewalletd.cpp:677
+#: misc/tdewalletd/tdewalletd.cpp:678
 msgid "Error re-encrypting the wallet. Password was not changed."
 msgstr ""
 "Die wagwoord was nie verander nie: 'n Fout het voorgekom met die "
 "herenkriptering van die beurse. "
 
-#: misc/tdewalletd/tdewalletd.cpp:682
+#: misc/tdewalletd/tdewalletd.cpp:683
 msgid "Error reopening the wallet. Data may be lost."
 msgstr "Kon nie die beursie weer oopmaak nie. Data mag verlore gegaan het."
 
-#: 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-af/messages/tdelibs/tdelibs.po b/tde-i18n-af/messages/tdelibs/tdelibs.po
index 7d1f55f070c..74ef3443cf5 100644
--- a/tde-i18n-af/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-af/messages/tdelibs/tdelibs.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs stable\n"
-"POT-Creation-Date: 2019-01-13 18:39+0100\n"
+"POT-Creation-Date: 2019-01-23 23:08+0100\n"
 "PO-Revision-Date: 2006-01-12 16:33+0200\n"
 "Last-Translator: JUANITA FRANZ <JUANITA.FRANZ@VR-WEB.DE>\n"
 "Language-Team: AFRIKAANS <translate-discuss-af@lists.sourceforge.net>\n"
@@ -2310,7 +2310,7 @@ msgstr "Embleem"
 msgid "Photo"
 msgstr "Foto"
 
-#: tdeabc/addressee.cpp:948 tdecore/tdehw/tdehardwaredevices.cpp:4208
+#: tdeabc/addressee.cpp:948 tdecore/tdehw/tdehardwaredevices.cpp:4122
 msgid "Sound"
 msgstr "Klank"
 
@@ -2679,7 +2679,7 @@ msgstr "Video"
 msgid "Mailbox"
 msgstr "Posbus"
 
-#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4190
+#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4107
 msgid "Modem"
 msgstr "Modem"
 
@@ -4750,72 +4750,6 @@ msgstr ""
 msgid "No PSK provided"
 msgstr "Geen verskaffer gekies."
 
-#: 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 "Onbekend"
-
-#: 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 "Voorskou nie beskikbaar nie."
-
-#: 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 "Ongeldige sertifikaat!"
-
-#: 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 ""
@@ -4917,7 +4851,7 @@ msgid "Generic Input Device"
 msgstr "Generiese opsies"
 
 #: tdecore/tdehw/tdegenericdevice.cpp:315
-#: tdecore/tdehw/tdehardwaredevices.cpp:3319
+#: tdecore/tdehw/tdehardwaredevices.cpp:3256
 msgid "Generic %1 Device"
 msgstr ""
 
@@ -4931,261 +4865,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 "Onbekende Veld"
 
-#: 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 "Onbekende Veld"
 
-#: 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 "Onbekende Veld"
 
-#: 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 "Onbekende Veld"
 
-#: 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 "Stelsel Kieslys"
 
-#: 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 "Geografiese Posisie"
 
-#: 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 "Hoof Nutsbalk"
 
-#: 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 "Druk"
 
-#: 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 "Video Nutsbalk"
 
-#: 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 "Teks Slegs"
 
-#: 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 "Terug"
 
-#: 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 "Oriëntasie"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4247
+#: tdecore/tdehw/tdehardwaredevices.cpp:4161
 #, fuzzy
 msgid "Thermal Sensor"
 msgstr "Algemeen Instellings"
 
-#: 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 "Sekuriteit"
-
-#: 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 "Maak invoer skoon"
 
-#: 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 "Ander"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4292
+#: tdecore/tdehw/tdehardwaredevices.cpp:4191
 #, fuzzy
 msgid "Other USB"
 msgstr "Ander"
 
-#: 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 ""
 
@@ -5233,109 +5142,94 @@ msgstr ""
 msgid "Virtual Private Network"
 msgstr ""
 
-#: tdecore/tdehw/tdestoragedevice.cpp:279
-#, fuzzy
-msgid "Inactive"
-msgstr "Relatief"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:282
-#, fuzzy
-msgid "Active"
-msgstr "Aksie"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:285
-#: tdehtml/java/kjavaappletserver.cpp:667
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: 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 "Verwyder Inskrywing"
 
-#: 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 "Sekuriteit"
 
-#: 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 ""
 
@@ -5922,6 +5816,10 @@ msgstr "PrivaatSleutel Gevaal"
 msgid "InvalidHost"
 msgstr "Ongeldige Masjien"
 
+#: tdehtml/java/kjavaappletserver.cpp:667
+msgid "Unknown"
+msgstr "Onbekend"
+
 #: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6842
 msgid "Security Alert"
 msgstr "Sekuriteit Waarskuwing"
@@ -8894,23 +8792,23 @@ msgstr "Oopskyf Lys && Outomaties"
 msgid "&Browse..."
 msgstr "Blaai..."
 
-#: tdeui/kpassdlg.cpp:250
+#: tdeui/kpassdlg.cpp:255
 msgid "&Password:"
 msgstr "Wagwoord:"
 
-#: tdeui/kpassdlg.cpp:269
+#: tdeui/kpassdlg.cpp:274
 msgid "&Keep password"
 msgstr "Hou wagwoord"
 
-#: tdeui/kpassdlg.cpp:289
+#: tdeui/kpassdlg.cpp:294
 msgid "&Verify:"
 msgstr "Bevestig:"
 
-#: tdeui/kpassdlg.cpp:311
+#: tdeui/kpassdlg.cpp:316
 msgid "Password strength meter:"
 msgstr "Wagwoorde sterkte meter:"
 
-#: 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"
@@ -8925,15 +8823,15 @@ msgstr ""
 " - 'n kombinasie van hoof en kleinletters te meng;\n"
 " - nommbers en simbole te meng met letters."
 
-#: tdeui/kpassdlg.cpp:331 tdeui/kpassdlg.cpp:524
+#: tdeui/kpassdlg.cpp:336 tdeui/kpassdlg.cpp:530
 msgid "Passwords do not match"
 msgstr "Wagwoorde stem nie ooreen nie"
 
-#: tdeui/kpassdlg.cpp:408
+#: tdeui/kpassdlg.cpp:413
 msgid "You entered two different passwords. Please try again."
 msgstr "Jy ingevoerde twee ander wagwoorde. Asseblief probeer weer."
 
-#: 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"
@@ -8949,15 +8847,15 @@ msgstr ""
 " - 'n kombinasie van hoof en kleinletters te meng;\n"
 " - nommbers en simbole te meng met letters."
 
-#: tdeui/kpassdlg.cpp:423
+#: tdeui/kpassdlg.cpp:428
 msgid "Low Password Strength"
 msgstr "Lae Wagwoord Sterkte"
 
-#: tdeui/kpassdlg.cpp:518
+#: tdeui/kpassdlg.cpp:524
 msgid "Password is empty"
 msgstr "Die wagwoord is leeg"
 
-#: tdeui/kpassdlg.cpp:521
+#: tdeui/kpassdlg.cpp:527
 #, c-format
 msgid ""
 "_n: Password must be at least 1 character long\n"
@@ -8966,7 +8864,7 @@ msgstr ""
 "Die wagwoord moet ten minste 1 karakter lank wees\n"
 "Die wagwoord moet ten minste %n karakters lank wees"
 
-#: tdeui/kpassdlg.cpp:523
+#: tdeui/kpassdlg.cpp:529
 msgid "Passwords match"
 msgstr "Wagwoorde stem ooreen"
 
@@ -13553,6 +13451,30 @@ msgstr "Die wagwoord is leeg"
 msgid "The size of the dialog"
 msgstr "Leidraad van die Dag"
 
+#, fuzzy
+#~ msgid "Unknown (%1)"
+#~ msgstr "Onbekend"
+
+#, fuzzy
+#~ msgid "Card watcher object not available"
+#~ msgstr "Voorskou nie beskikbaar nie."
+
+#, fuzzy
+#~ msgid "Cannot read certificate: %1"
+#~ msgstr "Ongeldige sertifikaat!"
+
+#, fuzzy
+#~ msgid "Biometric Security"
+#~ msgstr "Sekuriteit"
+
+#, fuzzy
+#~ msgid "Inactive"
+#~ msgstr "Relatief"
+
+#, fuzzy
+#~ msgid "Active"
+#~ msgstr "Aksie"
+
 #~ 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="