Merge translation files from master branch.

2 files changed, 188 insertions, 18 deletions

diff --git a/tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po b/tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
index 2c474799b4e..5d5bf9c6d97 100644
--- a/tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
@@ -6,7 +6,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: 2006-02-20 23:51+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -413,35 +413,177 @@ msgstr "&Middle button:"
 msgid "Right b&utton:"
 msgstr "Right b&utton:"
 
-#~ msgid "Sho&w application icons"
-#~ msgstr "Sho&w application icons"
+#, fuzzy
+#~| msgid "Taskbar"
+#~ msgid "&Tasks"
+#~ msgstr "Taskbar"
+
+#~ msgid "Alt+S"
+#~ msgstr "Alt+S"
 
+#, 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 ""
-#~ "Select this option if you want window icons to appear along with their "
-#~ "titles in the taskbar.\n"
+#~ "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 ""
+#~ "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."
+#~ "By default, this option is selected and all windows are shown."
+
+#, fuzzy
+#~ msgid "Alt+T"
+#~ msgstr "Alt+T"
+
+#, 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 ""
-#~ "Select this option if you want window icons to appear along with their "
-#~ "titles in the taskbar.\n"
+#~ "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 "Alt+R"
+#~ msgstr "Alt+R"
+
 #, fuzzy
-#~ msgid "Alt+C"
+#~| 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 ""
+#~ "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."
+
+#, fuzzy
+#~ msgid "Alt+N"
 #~ msgstr "Alt+T"
 
-#~ msgid "Alt+S"
-#~ msgstr "Alt+S"
+#, 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 ""
+#~ "Select this option if you want the taskbar to display <b>only</b> "
+#~ "minimised windows. \n"
+#~ "\n"
+#~ "By default, this option is not selected and the taskbar will show all "
+#~ "windows."
+
+#, fuzzy
+#~ msgid "Alt+A"
+#~ msgstr "Alt+T"
+
+#~ msgid "Alt+Y"
+#~ msgstr "Alt+Y"
+
+#, 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 ""
+#~ "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."
+
+#, fuzzy
+#~| msgid "A&ppearance:"
+#~ msgid "&Appearance"
+#~ msgstr "A&ppearance:"
+
+#, fuzzy
+#~ msgid "Alt+C"
+#~ msgstr "Alt+T"
 
 #~ msgid "Alt+B"
 #~ msgstr "Alt+B"
 
-#~ msgid "Alt+W"
-#~ msgstr "Alt+W"
+#, fuzzy
+#~ msgid "Selecting this option makes the taskbar use small icons."
+#~ msgstr ""
+#~ "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 "Alt+R"
-#~ msgstr "Alt+R"
+#, fuzzy
+#~| msgid "Taskbar"
+#~ msgid "Taskbar style:"
+#~ msgstr "Taskbar"
 
-#~ msgid "Alt+Y"
-#~ msgstr "Alt+Y"
+#, fuzzy
+#~| msgid "Actions"
+#~ msgid "A&ctions"
+#~ msgstr "Actions"
+
+#, fuzzy
+#~| msgid "Actions"
+#~ msgid "Mouse Actions"
+#~ msgstr "Actions"
+
+#~ msgid "Sho&w application icons"
+#~ msgstr "Sho&w application icons"
+
+#~ msgid ""
+#~ "Select this option if you want window icons to appear along with their "
+#~ "titles in the taskbar.\n"
+#~ "\n"
+#~ "By default this option is selected."
+#~ msgstr ""
+#~ "Select this option if you want window icons to appear along with their "
+#~ "titles in the taskbar.\n"
+#~ "\n"
+#~ "By default this option is selected."
+
+#~ msgid "Alt+W"
+#~ msgstr "Alt+W"
diff --git a/tde-i18n-en_GB/messages/tdebase/libtaskbar.po b/tde-i18n-en_GB/messages/tdebase/libtaskbar.po
index 4ba1948f932..6e71214a51b 100644
--- a/tde-i18n-en_GB/messages/tdebase/libtaskbar.po
+++ b/tde-i18n-en_GB/messages/tdebase/libtaskbar.po
@@ -6,7 +6,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: 2005-11-04 14:26+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -457,6 +457,34 @@ msgstr ""
 msgid "This color is used for displaying background of taskbar buttons."
 msgstr ""
 
+#, 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 ""
+#~ "Turning this option on will cause the taskbar to draw visible button "
+#~ "frames for each entry in the taskbar. \\n\\nBy default, this option is "
+#~ "off."
+
+#, 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 ""
+#~ "Enabling this option will draw a thumbnail of the window in its mouse-"
+#~ "over effect.<p>If a window is minimised 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 "Show application icons"
 #~ msgstr "Show application icons"