Merge translation files from master branch.

2 files changed, 22 insertions, 29 deletions

diff --git a/tde-i18n-nb/messages/tdeartwork/klock.po b/tde-i18n-nb/messages/tdeartwork/klock.po
index 73724aa7fd1..bb6af5c2cab 100644
--- a/tde-i18n-nb/messages/tdeartwork/klock.po
+++ b/tde-i18n-nb/messages/tdeartwork/klock.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klock\n"
-"POT-Creation-Date: 2019-01-13 19:00+0100\n"
+"POT-Creation-Date: 2019-01-23 23:29+0100\n"
 "PO-Revision-Date: 2005-10-27 22:42+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -217,7 +217,7 @@ msgid "Cycling color"
 msgstr "Vekslende farger"
 
 #: kdesavers/banner.cpp:133 kdesavers/lines.cpp:139 kdesavers/lorenz.cpp:82
-#: kdesavers/polygon.cpp:87 kdesavers/science.cpp:932 xsavers/space.cpp:592
+#: kdesavers/polygon.cpp:87 kdesavers/science.cpp:932 xsavers/space.cpp:593
 #: xsavers/swarm.cpp:328
 msgid "Speed:"
 msgstr "Fart:"
@@ -304,11 +304,11 @@ msgstr ""
 "Skrevet av Tiaan Wessels 1997\n"
 "tiaan@netsys.co.za"
 
-#: kdesavers/firesaver.cpp:74
+#: kdesavers/firesaver.cpp:73
 msgid "Setup Screen Saver"
 msgstr "Tilpass pauseskjermen"
 
-#: kdesavers/firesaver.cpp:85
+#: kdesavers/firesaver.cpp:84
 msgid ""
 "<h3>KFireSaver 3D 1.0</h3>\n"
 "<p>TEST Koral - Enrico Ros::2004</p>"
@@ -316,35 +316,35 @@ msgstr ""
 "<h3>KFireSaver 3D 1.0</h3>\n"
 "<p>TEST Koral – Enrico Ros::2004</p>"
 
-#: kdesavers/firesaver.cpp:100
+#: kdesavers/firesaver.cpp:99
 msgid "Fireworks 3D (GL)"
 msgstr "Fyrverkeri 3D (GL)"
 
-#: kdesavers/firesaver.cpp:523
+#: kdesavers/firesaver.cpp:522
 msgid "www.kde.org"
 msgstr "www.kde.org"
 
-#: kdesavers/firesaver.cpp:524
+#: kdesavers/firesaver.cpp:523
 msgid "My TDE, please!"
 msgstr "Min TDE, takk!"
 
-#: kdesavers/firesaver.cpp:525
+#: kdesavers/firesaver.cpp:524
 msgid "KoNqUeR the World"
 msgstr "ErObRe Verden"
 
-#: kdesavers/firesaver.cpp:526
+#: kdesavers/firesaver.cpp:525
 msgid "KFIRESAVER 3D"
 msgstr "KFIRESAVER 3D"
 
-#: kdesavers/firesaver.cpp:527
+#: kdesavers/firesaver.cpp:526
 msgid "Gimme your eyes..."
 msgstr "Gi meg dine øyne …"
 
-#: kdesavers/firesaver.cpp:528
+#: kdesavers/firesaver.cpp:527
 msgid "Thank you for using TDE"
 msgstr "Takk for at du bruker TDE"
 
-#: kdesavers/firesaver.cpp:529
+#: kdesavers/firesaver.cpp:528
 msgid "Going insane tonight"
 msgstr "Blir sprø i kveld"
 
@@ -786,19 +786,19 @@ msgstr "Start pauseskjerm i demomodus"
 msgid "TDELock"
 msgstr "TDELock"
 
-#: xsavers/space.cpp:425
+#: xsavers/space.cpp:426
 msgid "GL can not render with root visual\n"
 msgstr "GL kan ikke kjøre med visuell rot\n"
 
-#: xsavers/space.cpp:578
+#: xsavers/space.cpp:579
 msgid "Setup Space Screen Saver"
 msgstr "Tilpass pauseskjermen Rom"
 
-#: xsavers/space.cpp:602
+#: xsavers/space.cpp:603
 msgid "Warp interval:"
 msgstr "Warp-intervall:"
 
-#: xsavers/space.cpp:675
+#: xsavers/space.cpp:676
 msgid ""
 "KSpace\n"
 "Copyright (c) 1998\n"
diff --git a/tde-i18n-nb/messages/tdeartwork/twin_art_clients.po b/tde-i18n-nb/messages/tdeartwork/twin_art_clients.po
index 54844c04c0c..d2cccb92376 100644
--- a/tde-i18n-nb/messages/tdeartwork/twin_art_clients.po
+++ b/tde-i18n-nb/messages/tdeartwork/twin_art_clients.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: twin_art_clients\n"
-"POT-Creation-Date: 2019-01-13 19:00+0100\n"
+"POT-Creation-Date: 2019-01-23 23:29+0100\n"
 "PO-Revision-Date: 2005-05-23 21:02+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -172,24 +172,17 @@ msgstr "Åpne TDEs temamappe for IceWM"
 #, fuzzy
 msgid ""
 "Clicking on the link above will cause a window to appear showing the TDE "
-"IceWM theme folder. You can add or remove native IceWM themes by installing "
-"theme files into this folder or by creating folder symlinks to existing "
-"IceWM themes on your system. You can get extra-themes here: <b>https://"
-"github.com/bbidulock/icewm-extra-themes</b>"
+"IceWM theme folder. You can add or remove native IceWM themes by "
+"uncompressing <b>http://icewm.themes.org/</b> theme files into this folder, "
+"or by creating folder symlinks to existing IceWM themes on your system."
 msgstr ""
 "Trykker du på lenka over, så åpnes et vindu som viser TDEs temamappe for "
 "IceWM. Du kan legge til eller ta bort egne IceWM-temaer ved å pakke ut "
 "temafiler fra <b>http://icewm.themes.org/</b> i denne mappa, eller ved å "
 "lage symbolske lenker til IceWM-temaer andre steder på systemet ditt."
 
-#: icewm/config/config.cpp:107
-msgid ""
-"You're supposed to copy the entire theme folders into your TDE IceWM theme "
-"folder."
-msgstr ""
-
-#: icewm/config/config.cpp:170 icewm/config/config.cpp:212
-#: icewm/config/config.cpp:256 icewm/config/config.cpp:271
+#: icewm/config/config.cpp:167 icewm/config/config.cpp:209
+#: icewm/config/config.cpp:253 icewm/config/config.cpp:268
 msgid "Infadel #2 (default)"
 msgstr "Infadel #2 (standard)"