Merge translation files from master branch.

2 files changed, 158 insertions, 2 deletions

diff --git a/tde-i18n-nb/messages/tdebase/kcmtaskbar.po b/tde-i18n-nb/messages/tdebase/kcmtaskbar.po
index 2ecbf900a19..01add46e72a 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: 2020-05-11 04:02+0200\n"
+"POT-Creation-Date: 2021-07-07 22:18+0000\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"
@@ -414,6 +414,135 @@ msgstr "&Midtknapp:"
 msgid "Right b&utton:"
 msgstr "s&Høyreknapp:"
 
+#, fuzzy
+#~| msgid "Taskbar"
+#~ msgid "&Tasks"
+#~ msgstr "Oppgavelinje"
+
+#, fuzzy
+#~| msgid ""
+#~| "Turning this option off will cause the taskbar to display <b>only</b> "
+#~| "the windows on the current desktop. \n"
+#~| "\n"
+#~| "By default, this option is selected and all windows are shown."
+#~ msgid ""
+#~ "Turning this option off will cause the taskbar to display <b>only</b> the "
+#~ "windows on the current desktop. By default, this option is selected and "
+#~ "all windows are shown."
+#~ msgstr ""
+#~ "Ta bort krysset her hvis du vil at oppgavelinja skal <b>bare</b> vise "
+#~ "vinduer på gjeldende skriverbord.\n"
+#~ "\n"
+#~ " Standard er at oppgavelinja viser alle vinduene."
+
+#, fuzzy
+#~| msgid ""
+#~| "Selecting this option causes the taskbar to show windows in order of the "
+#~| "desktop they appear on.\n"
+#~| "\n"
+#~| "By default this option is selected."
+#~ msgid ""
+#~ "Selecting this option causes the taskbar to show windows in order of the "
+#~ "desktop they appear on. By default this option is selected."
+#~ msgstr ""
+#~ "Valg av dette gjør at oppgavelinja viser vinduer i den rekkefølgen som "
+#~ "skrivebordene vises. \n"
+#~ "\n"
+#~ "Dette er standardvalget."
+
+#, fuzzy
+#~| msgid ""
+#~| "Turning this option off will cause the taskbar to display <b>only</b> "
+#~| "windows which are on the same Xinerama screen as the taskbar.\n"
+#~| "\n"
+#~| "By default, this option is selected and all windows are shown."
+#~ msgid ""
+#~ "Turning this option off will cause the taskbar to display <b>only</b> "
+#~ "windows which are on the same Xinerama screen as the taskbar. By default, "
+#~ "this option is selected and all windows are shown."
+#~ msgstr ""
+#~ "Ta bort krysset her hvis du vil at oppgavelinja skal <b>bare</b> vise "
+#~ "vinduer som er i samme Xinerama-skjerm som oppgavelinja.\n"
+#~ "\n"
+#~ "Som standard er dette slått på og alle vinduene vises."
+
+#, fuzzy
+#~| msgid ""
+#~| "Select this option if you want the taskbar to display <b>only</b> "
+#~| "minimized windows. \n"
+#~| "\n"
+#~| "By default, this option is not selected and the taskbar will show all "
+#~| "windows."
+#~ msgid ""
+#~ "Select this option if you want the taskbar to display <b>only</b> "
+#~ "minimized windows. By default, this option is not selected and the "
+#~ "taskbar will show all windows."
+#~ msgstr ""
+#~ "Kryss av her hvis du vil at oppgavelinja skal <b>bare</b> vise minimerte "
+#~ "vinduer.\n"
+#~ "\n"
+#~ "Standard er at oppgavelinja viser alle vinduene."
+
+#, fuzzy
+#~| msgid ""
+#~| "The taskbar can group similar windows into single buttons. When one of "
+#~| "these window group buttons are clicked on a menu appears showing all the "
+#~| "windows in that group. This can be especially useful with the <em>Show "
+#~| "all windows</em> option.\n"
+#~| "\n"
+#~| "You can set the taskbar to <strong>Never</strong> group windows, to "
+#~| "<strong>Always</strong> group windows or to group windows only "
+#~| "<strong>When the Taskbar is Full</strong>.\n"
+#~| "\n"
+#~| "By default the taskbar groups windows when it is full."
+#~ msgid ""
+#~ "The taskbar can group similar windows into single buttons. When one of "
+#~ "these window group buttons are clicked on a menu appears showing all the "
+#~ "windows in that group. This can be especially useful with the <em>Show "
+#~ "all windows</em> option. You can set the taskbar to <strong>Never</"
+#~ "strong> group windows, to <strong>Always</strong> group windows or to "
+#~ "group windows only <strong>When the Taskbar is Full</strong>. By default "
+#~ "the taskbar groups windows when it is full."
+#~ msgstr ""
+#~ "Oppgavelinja kan gruppere liknende vinduer i enkle knapper. Når man "
+#~ "trykker på en av disse vindusgruppene vil man få en meny med alle "
+#~ "vinduene i gruppen. Dette kan være spesielt nyttig med <em>Vis alle "
+#~ "vinduer</em>-valget.\n"
+#~ "\n"
+#~ "Man kan sette oppgavelinja til <strong>Aldri</strong> ågruppere vinduer, "
+#~ "til <strong>Alltid</strong> å gruppere vinduer eller gruppere vinduer "
+#~ "<strong>Når hele oppgavelinja er full</strong>.\n"
+#~ "\n"
+#~ "Som standard grupperes vinduer når oppgavelinja er full."
+
+#, fuzzy
+#~| msgid "A&ppearance:"
+#~ msgid "&Appearance"
+#~ msgstr "U&tseende:"
+
+#, fuzzy
+#~ msgid "Selecting this option makes the taskbar use small icons."
+#~ msgstr ""
+#~ "Valg av dette gjør at oppgavelinja viser vinduer i den rekkefølgen som "
+#~ "skrivebordene vises. \n"
+#~ "\n"
+#~ "Dette er standardvalget."
+
+#, fuzzy
+#~| msgid "Taskbar"
+#~ msgid "Taskbar style:"
+#~ msgstr "Oppgavelinje"
+
+#, fuzzy
+#~| msgid "Actions"
+#~ msgid "A&ctions"
+#~ msgstr "Handlinger"
+
+#, fuzzy
+#~| msgid "Actions"
+#~ msgid "Mouse Actions"
+#~ msgstr "Handlinger"
+
 #~ msgid "Sho&w application icons"
 #~ msgstr "Vis program&ikoner"
 
diff --git a/tde-i18n-nb/messages/tdebase/libtaskbar.po b/tde-i18n-nb/messages/tdebase/libtaskbar.po
index 69d2ce59370..f54a554df45 100644
--- a/tde-i18n-nb/messages/tdebase/libtaskbar.po
+++ b/tde-i18n-nb/messages/tdebase/libtaskbar.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtaskbar\n"
-"POT-Creation-Date: 2020-05-11 04:02+0200\n"
+"POT-Creation-Date: 2021-07-07 22:18+0000\n"
 "PO-Revision-Date: 2007-03-17 14:19+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -466,6 +466,33 @@ msgstr "Farge som skal brukes for bakgrunnen til oppgavelinjens knapper"
 msgid "This color is used for displaying background of taskbar buttons."
 msgstr "Denne fargen brukes til å vise bakgrunnen for oppgavelinjens knapper."
 
+#, fuzzy
+#~ msgid ""
+#~ "Turning this option on will cause the taskbar to draw a visible button "
+#~ "frame around the item currently under the mouse. By default, this option "
+#~ "is on."
+#~ msgstr ""
+#~ "Hvis dette er slått av vil oppgavelinja tegne synlige knapperammer for "
+#~ "hver oppføring på oppgavelinja. \\n\\nDette er slått av som standard."
+
+#, fuzzy
+#~| msgid ""
+#~| "Enabling this option will draw a thumbnail of the window in its mouse-"
+#~| "over effect.<p>If a window is minimized or resides on a different "
+#~| "desktop while the taskbar is starting, an icon is shown until the window "
+#~| "is restored or the appropriate desktop is activated, respectively.</p>"
+#~ msgid ""
+#~ "Enabling this option will draw a thumbnail of the window in its mouse-"
+#~ "over effect.<p>If a window is minimized or resides on a different desktop "
+#~ "while the taskbar is starting, an icon is shown until the window is "
+#~ "restored or the appropriate desktop is activated, respectively. This "
+#~ "options needs a TWin compositor in order to work.</p>"
+#~ msgstr ""
+#~ "Hvis dette er slått på blir det vist et mini-bilde av vinduet når "
+#~ "musepekeren legges over. <p>Hvis et vindu er minimert eller ligger på et "
+#~ "annet skrivebord mens oppgavelinja starter, så blir det vist et ikon "
+#~ "inntil vinduet åpnes igjen eller det aktuelle skrivebordet skrus på.</p>"
+
 #~ msgid "Show application icons"
 #~ msgstr "Vis programikoner"