Merge translation files from master branch.

5 files changed, 12 insertions, 12 deletions

diff --git a/tde-i18n-nb/messages/tdebase/drkonqi.po b/tde-i18n-nb/messages/tdebase/drkonqi.po
index 68de970fd50..4cd5e0ffa46 100644
--- a/tde-i18n-nb/messages/tdebase/drkonqi.po
+++ b/tde-i18n-nb/messages/tdebase/drkonqi.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drkonqi\n"
-"POT-Creation-Date: 2018-12-06 17:06+0100\n"
+"POT-Creation-Date: 2019-07-08 00:06+0200\n"
 "PO-Revision-Date: 2005-09-20 21:06+0200\n"
 "Last-Translator: Nils Kristian Tomren <project@nilsk.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -329,7 +329,7 @@ msgstr ""
 
 #: toplevel.cpp:435
 msgid ""
-"<p>Your crash report has been uploaded!</p></p>You may reference it if "
+"<p>Your crash report has been uploaded!</p><p>You may reference it if "
 "desired by its unique ID:<br>%1</p>"
 msgstr ""
 
diff --git a/tde-i18n-nb/messages/tdebase/kcmkicker.po b/tde-i18n-nb/messages/tdebase/kcmkicker.po
index bcfbc0bc4f0..58a74379835 100644
--- a/tde-i18n-nb/messages/tdebase/kcmkicker.po
+++ b/tde-i18n-nb/messages/tdebase/kcmkicker.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkicker\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-08 00:06+0200\n"
 "PO-Revision-Date: 2007-03-17 10:58+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -496,7 +496,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "When checked, the displayed semi-transparent background image will be "
-"blurred to reduce eyestrain"
+"blurred to reduce eyestrain."
 msgstr ""
 
 #: advancedOptions.ui:317
@@ -721,7 +721,7 @@ msgstr ""
 msgid ""
 "When this option is selected, this panel will be hidden if its Xinerama "
 "screen is not available.  This panel will be automatically restored when the "
-"configured Xinerama screen is reenabked."
+"configured Xinerama screen is reenabled."
 msgstr ""
 
 #: hidingtab.ui:333
diff --git a/tde-i18n-nb/messages/tdebase/kcmtaskbar.po b/tde-i18n-nb/messages/tdebase/kcmtaskbar.po
index d7987484b01..39ffd1be190 100644
--- a/tde-i18n-nb/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-nb/messages/tdebase/kcmtaskbar.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmtaskbar\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-08 00:07+0200\n"
 "PO-Revision-Date: 2007-03-11 20:08+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -203,7 +203,7 @@ msgstr ""
 
 #: kcmtaskbarui.ui:81
 #, no-c-format
-msgid "Edt global floating taskbar configuration"
+msgid "Edit global floating taskbar configuration"
 msgstr ""
 
 #: kcmtaskbarui.ui:106
diff --git a/tde-i18n-nb/messages/tdebase/kdesktop.po b/tde-i18n-nb/messages/tdebase/kdesktop.po
index 8fb4b791055..03575153439 100644
--- a/tde-i18n-nb/messages/tdebase/kdesktop.po
+++ b/tde-i18n-nb/messages/tdebase/kdesktop.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdesktop\n"
-"POT-Creation-Date: 2019-04-01 09:21+0200\n"
+"POT-Creation-Date: 2019-07-08 00:07+0200\n"
 "PO-Revision-Date: 2006-06-26 12:11+0200\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.pping.uio.no>\n"
@@ -762,8 +762,8 @@ msgstr "Størrelse på bakgrunnslageret"
 #: kdesktop.kcfg:37
 #, no-c-format
 msgid ""
-"Here you can the opacity of the background (0-100). A composite manager can "
-"then render something behind it."
+"Here you can set the opacity of the background (0-100). A composite manager "
+"can then render something behind it."
 msgstr ""
 
 #: kdesktop.kcfg:43
diff --git a/tde-i18n-nb/messages/tdebase/konsole.po b/tde-i18n-nb/messages/tdebase/konsole.po
index fe61c4881cc..5b74b9e109f 100644
--- a/tde-i18n-nb/messages/tdebase/konsole.po
+++ b/tde-i18n-nb/messages/tdebase/konsole.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konsole\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-07-08 00:07+0200\n"
 "PO-Revision-Date: 2007-03-17 11:04+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -1417,7 +1417,7 @@ msgid ""
 "<p>...that working with remote hosts in Konsole can be made much easier by "
 "setting the\n"
 "prompt to correctly show your hostname and present path? Try setting your "
-"prompt in our\n"
+"prompt in your\n"
 "~/.bashrc with: \"export PS1='\\[\\e[0m\\h:\\w> '\" You can then just select "
 "your prompt and\n"
 "press middle-mouse to paste it as the source or destination on the command "