Merge translation files from master branch.

3 files changed, 285 insertions, 368 deletions

diff --git a/tde-i18n-nn/messages/tdelibs/katepart.po b/tde-i18n-nn/messages/tdelibs/katepart.po
index 0103f838cb8..3c61be90677 100644
--- a/tde-i18n-nn/messages/tdelibs/katepart.po
+++ b/tde-i18n-nn/messages/tdelibs/katepart.po
@@ -8,7 +8,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-08-09 17:15+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -632,14 +632,14 @@ msgstr "Etter lag&ring"
 msgid "Show indentation lines"
 msgstr "Vis innrykkslinjer"
 
-#: 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 ""
 "Denne funksjonen gjer at tekstlinjene vert brotne der tekstruta sluttar."
 
-#: 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 "Vel når merka for dynamisk tekstbryting skal visast"
 
@@ -1274,7 +1274,7 @@ msgstr "Vil du verkeleg halda fram med å lukka denne fila? Data kan gå tapt."
 msgid "Close Nevertheless"
 msgstr "Lukk likevel"
 
-#: 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 "Lagra fil"
 
@@ -1302,18 +1302,18 @@ msgstr "Fila «%1» blei oppretta av eit anna program."
 msgid "The file '%1' was deleted by another program."
 msgstr "Fila «%1» blei sletta av eit anna 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 ""
 "Ei fil som heiter «%1» finst frå før. Er du sikker på at du vil skriva over "
 "ho?"
 
-#: part/katedocument.cpp:5103 part/kateview.cpp:896
+#: part/katedocument.cpp:5103 part/kateview.cpp:891
 msgid "Overwrite File?"
 msgstr "Skriv over fil?"
 
-#: part/katedocument.cpp:5104 part/kateview.cpp:897
+#: part/katedocument.cpp:5104 part/kateview.cpp:892
 msgid "&Overwrite"
 msgstr "Skriv &over"
 
@@ -2533,40 +2533,27 @@ msgstr ""
 "Gjer om til stor forbokstav i det merkte området eller i ordet ved "
 "skrivemerket dersom ingenting er merkt."
 
-#: part/kateview.cpp:287 part/kateview.cpp:589
-msgid "Delete Line"
-msgstr "Slett linja"
-
-#: part/kateview.cpp:289
-#, fuzzy
-msgid "Use this to delete the current line."
-msgstr "Trykk på denne knappen for å sletta den valde eininga."
-
-#: part/kateview.cpp:291
+#: part/kateview.cpp:287
 msgid "Join Lines"
 msgstr "Slå saman linjer"
 
-#: 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 "Skriv ut dokumentet."
 
-#: part/kateview.cpp:306
+#: part/kateview.cpp:301
 msgid "Reloa&d"
 msgstr "Last om a&tt"
 
-#: part/kateview.cpp:307
+#: part/kateview.cpp:302
 msgid "Reload the current document from disk."
 msgstr "Last dokumentet om att frå disken."
 
-#: part/kateview.cpp:310
+#: part/kateview.cpp:305
 msgid "Save the current document to disk, with a name of your choice."
 msgstr "Lagra dokumentet på disken, med eit namn du vel."
 
-#: 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."
@@ -2574,39 +2561,39 @@ msgstr ""
 "Denne kommandoen opnar ein dialog der du kan velja kva for linje "
 "skrivemerket skal flyttast til."
 
-#: part/kateview.cpp:315
+#: part/kateview.cpp:310
 msgid "&Configure Editor..."
 msgstr "&Set opp skriveprogram …"
 
-#: part/kateview.cpp:316
+#: part/kateview.cpp:311
 msgid "Configure various aspects of this editor."
 msgstr "Tilpass ymse delar av skriveprogrammet."
 
-#: part/kateview.cpp:318
+#: part/kateview.cpp:313
 msgid "&Highlighting"
 msgstr "&Syntaksmerking"
 
-#: part/kateview.cpp:319
+#: part/kateview.cpp:314
 msgid "Here you can choose how the current document should be highlighted."
 msgstr "Her kan du velja syntaksmerkinga av dokumentet."
 
-#: part/kateview.cpp:322
+#: part/kateview.cpp:317
 msgid "&Filetype"
 msgstr "&Filtype"
 
-#: part/kateview.cpp:325
+#: part/kateview.cpp:320
 msgid "&Schema"
 msgstr "&Oppsett"
 
-#: part/kateview.cpp:329
+#: part/kateview.cpp:324
 msgid "&Indentation"
 msgstr "&Innrykk"
 
-#: part/kateview.cpp:332
+#: part/kateview.cpp:327
 msgid "E&xport as HTML..."
 msgstr "Eksporter som &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."
@@ -2614,38 +2601,38 @@ msgstr ""
 "Med denne kommandoen kan du eksportera det syntaksmerka dokumentet til eit "
 "HTML-dokument."
 
-#: part/kateview.cpp:337
+#: part/kateview.cpp:332
 msgid "Select the entire text of the current document."
 msgstr "Merk all teksten i dokumentet."
 
-#: 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 ""
 "Dersom du har merka noko i dokumentet, vil ikkje dette vera merka lengre."
 
-#: part/kateview.cpp:342
+#: part/kateview.cpp:337
 msgid "Enlarge Font"
 msgstr "Auke skriftstorleik"
 
-#: part/kateview.cpp:343
+#: part/kateview.cpp:338
 msgid "This increases the display font size."
 msgstr "Aukar tekststorleiken."
 
-#: part/kateview.cpp:345
+#: part/kateview.cpp:340
 msgid "Shrink Font"
 msgstr "Minske skriftstorleik"
 
-#: part/kateview.cpp:346
+#: part/kateview.cpp:341
 msgid "This decreases the display font size."
 msgstr "Minskar tekststorleiken."
 
-#: part/kateview.cpp:349
+#: part/kateview.cpp:344
 msgid "Bl&ock Selection Mode"
 msgstr "&Blokkmerkingsmodus"
 
-#: 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."
@@ -2653,11 +2640,11 @@ msgstr ""
 "Med denne kommandoen kan du byta mellom vanleg, linjebasert merkingsmodus og "
 "blokkmerkingsmodus."
 
-#: part/kateview.cpp:355
+#: part/kateview.cpp:350
 msgid "Overwr&ite Mode"
 msgstr "Overskr&ivingsmodus"
 
-#: 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."
@@ -2665,31 +2652,31 @@ msgstr ""
 "Vel om du vil at teksten du skriv skal setjast inn eller skriva over teksten "
 "som finst frå før."
 
-#: part/kateview.cpp:362
+#: part/kateview.cpp:357
 msgid "&Dynamic Word Wrap"
 msgstr "&Dynamisk tekstbryting"
 
-#: part/kateview.cpp:367
+#: part/kateview.cpp:362
 msgid "Dynamic Word Wrap Indicators"
 msgstr "Merke for dynamisk tekstbryting"
 
-#: part/kateview.cpp:372
+#: part/kateview.cpp:367
 msgid "&Off"
 msgstr "&Av"
 
-#: part/kateview.cpp:373
+#: part/kateview.cpp:368
 msgid "Follow &Line Numbers"
 msgstr "Følg &linjenummer"
 
-#: part/kateview.cpp:374
+#: part/kateview.cpp:369
 msgid "&Always On"
 msgstr "Alltid &på"
 
-#: part/kateview.cpp:378
+#: part/kateview.cpp:373
 msgid "Show Folding &Markers"
 msgstr "Vis &faldemerke"
 
-#: part/kateview.cpp:381
+#: part/kateview.cpp:376
 msgid ""
 "You can choose if the codefolding marks should be shown, if codefolding is "
 "possible."
@@ -2697,42 +2684,42 @@ msgstr ""
 "Du kan velja om brytingsmerka for kode skal visast, dersom kodebryting er "
 "mogleg."
 
-#: part/kateview.cpp:382
+#: part/kateview.cpp:377
 msgid "Hide Folding &Markers"
 msgstr "Vis &faldemerke"
 
-#: part/kateview.cpp:385
+#: part/kateview.cpp:380
 msgid "Show &Icon Border"
 msgstr "Vis &ikonramme"
 
-#: 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 ""
 "Vis/gøym ikonkanten. <BR><BR>Ikonkanten viser til dømes bokmerkesymbol."
 
-#: part/kateview.cpp:390
+#: part/kateview.cpp:385
 msgid "Hide &Icon Border"
 msgstr "Vis &ikonramme"
 
-#: part/kateview.cpp:393
+#: part/kateview.cpp:388
 msgid "Show &Line Numbers"
 msgstr "Vis &linjenummer"
 
-#: part/kateview.cpp:396
+#: part/kateview.cpp:391
 msgid "Show/hide the line numbers on the left hand side of the view."
 msgstr "Vis/gøym linjenummer til venstre for tekstruta."
 
-#: part/kateview.cpp:397
+#: part/kateview.cpp:392
 msgid "Hide &Line Numbers"
 msgstr "Vis &linjenummer"
 
-#: part/kateview.cpp:400
+#: part/kateview.cpp:395
 msgid "Show Scroll&bar Marks"
 msgstr "Vis merke i &rullefeltet"
 
-#: 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."
@@ -2740,15 +2727,15 @@ msgstr ""
 "Vis/gøym merka i det loddrette rullefeltet. <BR><BR>Merka kan til dømes visa "
 "bokmerke."
 
-#: part/kateview.cpp:404
+#: part/kateview.cpp:399
 msgid "Hide Scroll&bar Marks"
 msgstr "Gøym &rullefeltmerke"
 
-#: part/kateview.cpp:407
+#: part/kateview.cpp:402
 msgid "Show Static &Word Wrap Marker"
 msgstr "Vis merke for statisk tekstbryting"
 
-#: 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"
@@ -2756,238 +2743,242 @@ msgstr ""
 "Vis eller gøym merket for tekstbryting, ei loddrett linje som vert vist ved "
 "den tekstbrytingskolonnen du har vald i redigeringseigenskapane."
 
-#: part/kateview.cpp:413
+#: part/kateview.cpp:408
 msgid "Hide Static &Word Wrap Marker"
 msgstr "Gøym merke for &tekstbryting"
 
-#: part/kateview.cpp:416
+#: part/kateview.cpp:411
 msgid "Switch to Command Line"
 msgstr "Gå til kommandolinja"
 
-#: part/kateview.cpp:419
+#: part/kateview.cpp:414
 msgid "Show/hide the command line on the bottom of the view."
 msgstr "Vis/gøym kommandolinja nedanfor tekstruta."
 
-#: part/kateview.cpp:421
+#: part/kateview.cpp:416
 msgid "&End of Line"
 msgstr "Linj&eskift"
 
-#: part/kateview.cpp:422
+#: part/kateview.cpp:417
 msgid "Choose which line endings should be used, when you save the document"
 msgstr ""
 "Vel kva for linjeskiftteikn som skal brukast når dokumentet vert lagra."
 
-#: part/kateview.cpp:432
+#: part/kateview.cpp:427
 msgid "E&ncoding"
 msgstr "Teikn&koding"
 
-#: part/kateview.cpp:449
+#: part/kateview.cpp:444
 msgid "Move Word Left"
 msgstr "Gå eitt ord til venstre"
 
-#: part/kateview.cpp:453
+#: part/kateview.cpp:448
 msgid "Select Character Left"
 msgstr "Merk teikn til venstre"
 
-#: part/kateview.cpp:457
+#: part/kateview.cpp:452
 msgid "Select Word Left"
 msgstr "Merk ord til venstre"
 
-#: part/kateview.cpp:462
+#: part/kateview.cpp:457
 msgid "Move Word Right"
 msgstr "Gå eitt ord til høgre"
 
-#: part/kateview.cpp:466
+#: part/kateview.cpp:461
 msgid "Select Character Right"
 msgstr "Merk eitt teikn til høgre"
 
-#: part/kateview.cpp:470
+#: part/kateview.cpp:465
 msgid "Select Word Right"
 msgstr "Merk eitt ord til høgre"
 
-#: part/kateview.cpp:475
+#: part/kateview.cpp:470
 msgid "Move to Beginning of Line"
 msgstr "Gå til starten av linja"
 
-#: part/kateview.cpp:479
+#: part/kateview.cpp:474
 msgid "Move to Beginning of Document"
 msgstr "Gå til starten av dokumentet"
 
-#: part/kateview.cpp:483
+#: part/kateview.cpp:478
 msgid "Select to Beginning of Line"
 msgstr "Merk til starten av linja"
 
-#: part/kateview.cpp:487
+#: part/kateview.cpp:482
 msgid "Select to Beginning of Document"
 msgstr "Merk til starten av dokumentet"
 
-#: part/kateview.cpp:492
+#: part/kateview.cpp:487
 msgid "Move to End of Line"
 msgstr "Gå til slutten av linja"
 
-#: part/kateview.cpp:496
+#: part/kateview.cpp:491
 msgid "Move to End of Document"
 msgstr "Gå til slutten av dokumentet"
 
-#: part/kateview.cpp:500
+#: part/kateview.cpp:495
 msgid "Select to End of Line"
 msgstr "Merk til slutten av linja"
 
-#: part/kateview.cpp:504
+#: part/kateview.cpp:499
 msgid "Select to End of Document"
 msgstr "Merk til slutten av dokumentet"
 
-#: part/kateview.cpp:509
+#: part/kateview.cpp:504
 msgid "Select to Previous Line"
 msgstr "Merk til førre linje"
 
-#: part/kateview.cpp:513
+#: part/kateview.cpp:508
 msgid "Scroll Line Up"
 msgstr "Rull ei linje opp"
 
-#: part/kateview.cpp:517
+#: part/kateview.cpp:512
 msgid "Move to Next Line"
 msgstr "Gå til neste linje"
 
-#: part/kateview.cpp:520
+#: part/kateview.cpp:515
 msgid "Move to Previous Line"
 msgstr "Gå til førre linje"
 
-#: part/kateview.cpp:523
+#: part/kateview.cpp:518
 msgid "Move Character Right"
 msgstr "Gå eitt teikn til høgre"
 
-#: part/kateview.cpp:526
+#: part/kateview.cpp:521
 msgid "Move Character Left"
 msgstr "Gå eitt teikn til venstre"
 
-#: part/kateview.cpp:530
+#: part/kateview.cpp:525
 msgid "Select to Next Line"
 msgstr "Merk til neste linje"
 
-#: part/kateview.cpp:534
+#: part/kateview.cpp:529
 msgid "Scroll Line Down"
 msgstr "Rull ei linje ned"
 
-#: part/kateview.cpp:539
+#: part/kateview.cpp:534
 msgid "Scroll Page Up"
 msgstr "Rull ei side opp"
 
-#: part/kateview.cpp:543
+#: part/kateview.cpp:538
 msgid "Select Page Up"
 msgstr "Merk ei side opp"
 
-#: part/kateview.cpp:547
+#: part/kateview.cpp:542
 msgid "Move to Top of View"
 msgstr "Gå til øvst i tekstruta"
 
-#: part/kateview.cpp:551
+#: part/kateview.cpp:546
 msgid "Select to Top of View"
 msgstr "Merk til øvst i tekstruta"
 
-#: part/kateview.cpp:556
+#: part/kateview.cpp:551
 msgid "Scroll Page Down"
 msgstr "Rull ei side ned"
 
-#: part/kateview.cpp:560
+#: part/kateview.cpp:555
 msgid "Select Page Down"
 msgstr "Merk ei side ned"
 
-#: part/kateview.cpp:564
+#: part/kateview.cpp:559
 msgid "Move to Bottom of View"
 msgstr "Gå til nedst i tekstruta"
 
-#: part/kateview.cpp:568
+#: part/kateview.cpp:563
 msgid "Select to Bottom of View"
 msgstr "Merk til nedst i tekstruta"
 
-#: part/kateview.cpp:572
+#: part/kateview.cpp:567
 msgid "Move to Matching Bracket"
 msgstr "Gå til par-parentes"
 
-#: part/kateview.cpp:576
+#: part/kateview.cpp:571
 msgid "Select to Matching Bracket"
 msgstr "Merk til par-parentes"
 
-#: part/kateview.cpp:584
+#: part/kateview.cpp:579
 msgid "Transpose Characters"
 msgstr "Byt to granneteikn"
 
-#: part/kateview.cpp:594
+#: part/kateview.cpp:584
+msgid "Delete Line"
+msgstr "Slett linja"
+
+#: part/kateview.cpp:589
 msgid "Delete Word Left"
 msgstr "Slett ord til venstre"
 
-#: part/kateview.cpp:599
+#: part/kateview.cpp:594
 msgid "Delete Word Right"
 msgstr "Slett ord til høgre"
 
-#: part/kateview.cpp:603
+#: part/kateview.cpp:598
 msgid "Delete Next Character"
 msgstr "Slett neste teikn"
 
-#: part/kateview.cpp:607
+#: part/kateview.cpp:602
 msgid "Backspace"
 msgstr "Rettetast"
 
-#: part/kateview.cpp:633
+#: part/kateview.cpp:628
 msgid "Collapse Toplevel"
 msgstr "Fald saman toppnivå"
 
-#: part/kateview.cpp:635
+#: part/kateview.cpp:630
 msgid "Expand Toplevel"
 msgstr "Fald ut toppnivå"
 
-#: part/kateview.cpp:637
+#: part/kateview.cpp:632
 msgid "Collapse One Local Level"
 msgstr "Slå saman eitt lokalt nivå"
 
-#: part/kateview.cpp:639
+#: part/kateview.cpp:634
 msgid "Expand One Local Level"
 msgstr "Fald ut eitt lokalt nivå"
 
-#: part/kateview.cpp:644
+#: part/kateview.cpp:639
 msgid "Show the code folding region tree"
 msgstr "Vis områdetreet for kodebryting"
 
-#: part/kateview.cpp:645
+#: part/kateview.cpp:640
 msgid "Basic template code test"
 msgstr "Grunnleggjande malkodetest"
 
-#: part/kateview.cpp:707
+#: part/kateview.cpp:702
 msgid " OVR "
 msgstr " OVR "
 
-#: part/kateview.cpp:709
+#: part/kateview.cpp:704
 msgid " INS "
 msgstr " INN "
 
-#: part/kateview.cpp:712
+#: part/kateview.cpp:707
 msgid " R/O "
 msgstr " LES "
 
-#: part/kateview.cpp:717
+#: part/kateview.cpp:712
 #, c-format
 msgid " Line: %1"
 msgstr " Linje: %1"
 
-#: part/kateview.cpp:718
+#: part/kateview.cpp:713
 #, c-format
 msgid " Col: %1"
 msgstr " Kol: %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 "Skriv over fila"
 
-#: part/kateview.cpp:1799
+#: part/kateview.cpp:1794
 msgid "Export File as HTML"
 msgstr "Eksporter fil som HTML"
 
@@ -5210,6 +5201,10 @@ msgid ""
 msgstr "Bash"
 
 #, fuzzy
+#~ msgid "Use this to delete the current line."
+#~ msgstr "Trykk på denne knappen for å sletta den valde eininga."
+
+#, fuzzy
 #~ msgid "&Bookmarks"
 #~ msgstr "Bokmerke"
 
diff --git a/tde-i18n-nn/messages/tdelibs/tdeio.po b/tde-i18n-nn/messages/tdelibs/tdeio.po
index 33e8149f255..a533ba7b8f8 100644
--- a/tde-i18n-nn/messages/tdelibs/tdeio.po
+++ b/tde-i18n-nn/messages/tdelibs/tdeio.po
@@ -6,7 +6,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: 2007-08-09 17:17+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -339,11 +339,11 @@ msgstr "Sertifikatet er ikkje relevant."
 msgid "The certificate is invalid."
 msgstr "Sertifikatet er ikkje gyldig."
 
-#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:151
+#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:149
 msgid "Current connection is secured with SSL."
 msgstr "Sambandet er sikra med 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 "Sambandet er ikkje sikra med SSL."
 
@@ -366,103 +366,103 @@ msgstr ""
 "Hovuddelen av dette dokumentet er sikra med SSL, men enkelte delar er ikkje "
 "sikra."
 
-#: kssl/ksslinfodlg.cc:145
+#: kssl/ksslinfodlg.cc:144
 msgid "Some of this document is secured with SSL, but the main part is not."
 msgstr ""
 "Enkelte delar av dette dokumentet er sikra med SSL, men hovuddelen er ikkje "
 "sikra."
 
-#: kssl/ksslinfodlg.cc:188
+#: kssl/ksslinfodlg.cc:184
 msgid "Chain:"
 msgstr "Kjede:"
 
-#: kssl/ksslinfodlg.cc:197
+#: kssl/ksslinfodlg.cc:193
 msgid "0 - Site Certificate"
 msgstr "0 – Nettstadsertifikat"
 
-#: kssl/ksslinfodlg.cc:214
+#: kssl/ksslinfodlg.cc:210
 msgid "Peer certificate:"
 msgstr "Sertifikatet til motparten:"
 
-#: kssl/ksslinfodlg.cc:216
+#: kssl/ksslinfodlg.cc:212
 msgid "Issuer:"
 msgstr "Utferdar:"
 
-#: kssl/ksslinfodlg.cc:222
+#: kssl/ksslinfodlg.cc:218
 msgid "IP address:"
 msgstr "IP-adresse:"
 
-#: 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 "Sertifikatstatus:"
 
-#: kssl/ksslinfodlg.cc:240
+#: kssl/ksslinfodlg.cc:236
 msgid "Valid from:"
 msgstr "Gjeld frå:"
 
-#: kssl/ksslinfodlg.cc:242
+#: kssl/ksslinfodlg.cc:238
 msgid "Valid until:"
 msgstr "Gjeld til:"
 
-#: kssl/ksslinfodlg.cc:245
+#: kssl/ksslinfodlg.cc:241
 msgid "Serial number:"
 msgstr "Serienummer:"
 
-#: kssl/ksslinfodlg.cc:247
+#: kssl/ksslinfodlg.cc:243
 msgid "MD5 digest:"
 msgstr "MD5-samandrag:"
 
-#: kssl/ksslinfodlg.cc:250
+#: kssl/ksslinfodlg.cc:246
 msgid "Cipher in use:"
 msgstr "Chiffer i bruk:"
 
-#: kssl/ksslinfodlg.cc:252
+#: kssl/ksslinfodlg.cc:248
 msgid "Details:"
 msgstr "Detaljar:"
 
-#: kssl/ksslinfodlg.cc:254
+#: kssl/ksslinfodlg.cc:250
 msgid "SSL version:"
 msgstr "SSL-versjon:"
 
-#: kssl/ksslinfodlg.cc:256
+#: kssl/ksslinfodlg.cc:252
 msgid "Cipher strength:"
 msgstr "Chiffer-styrke:"
 
-#: kssl/ksslinfodlg.cc:257
+#: kssl/ksslinfodlg.cc:253
 msgid "%1 bits used of a %2 bit cipher"
 msgstr "%1 bit bruka av ein %2 bits cipher"
 
-#: kssl/ksslinfodlg.cc:413
+#: kssl/ksslinfodlg.cc:409
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: kssl/ksslinfodlg.cc:418
+#: kssl/ksslinfodlg.cc:414
 msgid "Organizational unit:"
 msgstr "Organisasjonseining:"
 
-#: kssl/ksslinfodlg.cc:423
+#: kssl/ksslinfodlg.cc:419
 msgid "Locality:"
 msgstr "Stad:"
 
-#: kssl/ksslinfodlg.cc:428
+#: kssl/ksslinfodlg.cc:424
 msgid ""
 "_: Federal State\n"
 "State:"
 msgstr "Delstat/region:"
 
-#: kssl/ksslinfodlg.cc:433
+#: kssl/ksslinfodlg.cc:429
 msgid "Country:"
 msgstr "Land:"
 
-#: kssl/ksslinfodlg.cc:438
+#: kssl/ksslinfodlg.cc:434
 msgid "Common name:"
 msgstr "Vanleg namn:"
 
-#: kssl/ksslinfodlg.cc:443
+#: kssl/ksslinfodlg.cc:439
 msgid "Email:"
 msgstr "E-post:"
 
@@ -498,23 +498,23 @@ msgstr "Lagra"
 msgid "Do Not Store"
 msgstr "Ikkje lagra"
 
-#: kssl/ksslkeygen.cc:209
+#: kssl/ksslkeygen.cc:210
 msgid "2048 (High Grade)"
 msgstr "2048 (sterk)"
 
-#: kssl/ksslkeygen.cc:210
+#: kssl/ksslkeygen.cc:211
 msgid "1024 (Medium Grade)"
 msgstr "1024 (middels)"
 
-#: kssl/ksslkeygen.cc:211
+#: kssl/ksslkeygen.cc:212
 msgid "768  (Low Grade)"
 msgstr "768  (svak)"
 
-#: kssl/ksslkeygen.cc:212
+#: kssl/ksslkeygen.cc:213
 msgid "512  (Low Grade)"
 msgstr "512  (svak)"
 
-#: kssl/ksslkeygen.cc:214
+#: kssl/ksslkeygen.cc:215
 msgid "No SSL support."
 msgstr "Inga SSL-støtte."
 
@@ -783,13 +783,13 @@ msgstr ""
 msgid "C&reate"
 msgstr "&Lag"
 
-#: 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 Lommebok-teneste"
 
-#: 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)"
@@ -797,11 +797,11 @@ msgstr ""
 "<qt>Feil ved opning av lommeboka «<b>%1</b>». Prøv ein gong til. "
 "<br>(Feilkode %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 har bede om tilgang til den opne lommeboka «<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>'."
@@ -809,26 +809,26 @@ msgstr ""
 "<qt>Programmet «<b>%1</b>» har bede om tilgang til den opne lommeboka «<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 ""
 "Kan ikkje opna lommeboka. Lommeboka må opnast for å kunne endra passordet."
 
-#: 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>Vel nytt passord for lommeboka «<b>%1</b>»."
 
-#: misc/tdewalletd/tdewalletd.cpp:677
+#: misc/tdewalletd/tdewalletd.cpp:678
 msgid "Error re-encrypting the wallet. Password was not changed."
 msgstr "Feil ved ny kryptering av lommeboka. Passordet blei ikkje endra."
 
-#: misc/tdewalletd/tdewalletd.cpp:682
+#: misc/tdewalletd/tdewalletd.cpp:683
 msgid "Error reopening the wallet. Data may be lost."
 msgstr "Feil ved gjenopning av lommeboka. Nokre data kan vera vekke."
 
-#: 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-nn/messages/tdelibs/tdelibs.po b/tde-i18n-nn/messages/tdelibs/tdelibs.po
index fa09a11e827..7ba7273bd09 100644
--- a/tde-i18n-nn/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-nn/messages/tdelibs/tdelibs.po
@@ -6,7 +6,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-09 17:22+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -2312,7 +2312,7 @@ msgstr "Logo"
 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 "Lyd"
 
@@ -2681,7 +2681,7 @@ msgstr "Video"
 msgid "Mailbox"
 msgstr "Postkasse"
 
-#: 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 "Ingen tilbydar vald."
 
-#: 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 "Ukjend"
-
-#: 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 "Førehandsvising er ikkje tilgjengeleg."
-
-#: 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 "Ugyldig sertifikat."
-
-#: 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 "Generelle val"
 
 #: 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 "Ukjent felt"
 
-#: 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 "Ukjent felt"
 
-#: 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 "Ukjent felt"
 
-#: 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 "Ukjent felt"
 
-#: 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 "Systemmeny"
 
-#: 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 "Geografisk posisjon"
 
-#: 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 "Hovudverktøylinje"
 
-#: 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 "Skriv ut"
 
-#: 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-verktøylinje"
 
-#: 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 "Berre tekst"
 
-#: 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 "Tilbake"
 
-#: 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 "Retning"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4247
+#: tdecore/tdehw/tdehardwaredevices.cpp:4161
 #, fuzzy
 msgid "Thermal Sensor"
 msgstr "Generelle innstillingar"
 
-#: 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 "Tryggleik"
-
-#: 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 "Tøm skrivefelt"
 
-#: 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 "Anna"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4292
+#: tdecore/tdehw/tdehardwaredevices.cpp:4191
 #, fuzzy
 msgid "Other USB"
 msgstr "Anna"
 
-#: 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 "Relativ"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:282
-#, fuzzy
-msgid "Active"
-msgstr "Handling"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:285
-#: tdehtml/java/kjavaappletserver.cpp:667
-msgid "Unknown"
-msgstr "Ukjend"
-
-#: 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 "Fjern oppføring"
 
-#: 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 "Tryggleik"
 
-#: 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 ""
 
@@ -5924,6 +5818,10 @@ msgstr "Privat nøkkel mislukkast"
 msgid "InvalidHost"
 msgstr "Ugyldig vert"
 
+#: tdehtml/java/kjavaappletserver.cpp:667
+msgid "Unknown"
+msgstr "Ukjend"
+
 #: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6842
 msgid "Security Alert"
 msgstr "Tryggleiksåtvaring"
@@ -8880,23 +8778,23 @@ msgstr "Nedtrekksliste og Automatisk"
 msgid "&Browse..."
 msgstr "&Bla gjennom …"
 
-#: tdeui/kpassdlg.cpp:250
+#: tdeui/kpassdlg.cpp:255
 msgid "&Password:"
 msgstr "&Passord:"
 
-#: tdeui/kpassdlg.cpp:269
+#: tdeui/kpassdlg.cpp:274
 msgid "&Keep password"
 msgstr "&Hugs passord"
 
-#: tdeui/kpassdlg.cpp:289
+#: tdeui/kpassdlg.cpp:294
 msgid "&Verify:"
 msgstr "&Stadfest:"
 
-#: tdeui/kpassdlg.cpp:311
+#: tdeui/kpassdlg.cpp:316
 msgid "Password strength meter:"
 msgstr "Styrkemålar for passord:"
 
-#: 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"
@@ -8910,15 +8808,15 @@ msgstr ""
 " – ei blanding av store og små bokstavar,\n"
 " – tal eller symbol, som #, i tillegg til bokstavar."
 
-#: tdeui/kpassdlg.cpp:331 tdeui/kpassdlg.cpp:524
+#: tdeui/kpassdlg.cpp:336 tdeui/kpassdlg.cpp:530
 msgid "Passwords do not match"
 msgstr "Passorda er ikkje like"
 
-#: tdeui/kpassdlg.cpp:408
+#: tdeui/kpassdlg.cpp:413
 msgid "You entered two different passwords. Please try again."
 msgstr "Du har oppgjeve to ulike passord. Prøv igjen."
 
-#: 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"
@@ -8936,15 +8834,15 @@ msgstr ""
 "\n"
 "Vil du bruka dette passordet likevel?"
 
-#: tdeui/kpassdlg.cpp:423
+#: tdeui/kpassdlg.cpp:428
 msgid "Low Password Strength"
 msgstr "Usikkert passord"
 
-#: tdeui/kpassdlg.cpp:518
+#: tdeui/kpassdlg.cpp:524
 msgid "Password is empty"
 msgstr "Passordet er tomt"
 
-#: tdeui/kpassdlg.cpp:521
+#: tdeui/kpassdlg.cpp:527
 #, c-format
 msgid ""
 "_n: Password must be at least 1 character long\n"
@@ -8953,7 +8851,7 @@ msgstr ""
 "Passordet må vera minst eitt teikn langt\n"
 "Passordet må vera minst %n teikn langt"
 
-#: tdeui/kpassdlg.cpp:523
+#: tdeui/kpassdlg.cpp:529
 msgid "Passwords match"
 msgstr "Passorda stemmer"
 
@@ -13515,6 +13413,30 @@ msgstr "Passordet er tomt"
 msgid "The size of the dialog"
 msgstr "Dagens tips"
 
+#, fuzzy
+#~ msgid "Unknown (%1)"
+#~ msgstr "Ukjend"
+
+#, fuzzy
+#~ msgid "Card watcher object not available"
+#~ msgstr "Førehandsvising er ikkje tilgjengeleg."
+
+#, fuzzy
+#~ msgid "Cannot read certificate: %1"
+#~ msgstr "Ugyldig sertifikat."
+
+#, fuzzy
+#~ msgid "Biometric Security"
+#~ msgstr "Tryggleik"
+
+#, fuzzy
+#~ msgid "Inactive"
+#~ msgstr "Relativ"
+
+#, fuzzy
+#~ msgid "Active"
+#~ msgstr "Handling"
+
 #~ 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="