Merge translation files from master branch.

2 files changed, 159 insertions, 2 deletions

diff --git a/tde-i18n-ja/messages/tdebase/kcmtaskbar.po b/tde-i18n-ja/messages/tdebase/kcmtaskbar.po
index 391122dae0a..37f0739586a 100644
--- a/tde-i18n-ja/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-ja/messages/tdebase/kcmtaskbar.po
@@ -7,7 +7,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-02-27 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -413,6 +413,134 @@ msgstr "中ボタン(&M):"
 msgid "Right b&utton:"
 msgstr "右ボタン(&U):"
 
+#, fuzzy
+#~| msgid "Taskbar"
+#~ msgid "&Tasks"
+#~ msgstr "タスクバー"
+
+#, 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 ""
+#~ "このオプションを無効にすると、現在のデスクトップに配置されているウィンドウ"
+#~ "のみがタスクバーに表示されます。\n"
+#~ "\n"
+#~ "標準ではすべてのウィンドウが表示されます。"
+
+#, 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 ""
+#~ "このオプションを選択すると、ウィンドウをそれが配置されているデスクトップの"
+#~ "順にタスクバーに表示します。\n"
+#~ "\n"
+#~ "このオプションは標準で有効になっています。"
+
+#, 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 ""
+#~ "このオプションを無効にすると、タスクバーと同じ Xinerama スクリーンにある"
+#~ "ウィンドウのみをタスクバーに表示します。\n"
+#~ "\n"
+#~ "標準ではすべてのウィンドウが表示されます。"
+
+#, 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 ""
+#~ "タスクバーに最小化されたウィンドウのみを表示するには、このオプションを選択"
+#~ "してください。\n"
+#~ "\n"
+#~ "標準ではすべてのウィンドウが表示されます。"
+
+#, 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 ""
+#~ "タスクバーは似たようなウィンドウを一つのボタンにまとめることができます。ボ"
+#~ "タンをクリックすると、そのボタンにまとめられたすべてのウィンドウがメニュー"
+#~ "として表示されます。これは特に「すべてのウィンドウを表示」オプションと一緒"
+#~ "に使うと便利でしょう。\n"
+#~ "\n"
+#~ "タスクバーの挙動は、グループ化「しない」、「常に」する、「タスクバーがいっ"
+#~ "ぱいのとき」だけする、の三通りに設定できます。\n"
+#~ "\n"
+#~ "標準ではタスクバーがいっぱいのときだけまとめます。"
+
+#, fuzzy
+#~| msgid "A&ppearance:"
+#~ msgid "&Appearance"
+#~ msgstr "外観(&P):"
+
+#, fuzzy
+#~ msgid "Selecting this option makes the taskbar use small icons."
+#~ msgstr ""
+#~ "このオプションを選択すると、ウィンドウをそれが配置されているデスクトップの"
+#~ "順にタスクバーに表示します。\n"
+#~ "\n"
+#~ "このオプションは標準で有効になっています。"
+
+#, fuzzy
+#~| msgid "Taskbar"
+#~ msgid "Taskbar style:"
+#~ msgstr "タスクバー"
+
+#, fuzzy
+#~| msgid "Actions"
+#~ msgid "A&ctions"
+#~ msgstr "アクション"
+
+#, fuzzy
+#~| msgid "Actions"
+#~ msgid "Mouse Actions"
+#~ msgstr "アクション"
+
 #~ msgid "Sho&w application icons"
 #~ msgstr "アプリケーションアイコンを表示する(&W)"
 
diff --git a/tde-i18n-ja/messages/tdebase/libtaskbar.po b/tde-i18n-ja/messages/tdebase/libtaskbar.po
index 725c97a66de..125e0f3fca0 100644
--- a/tde-i18n-ja/messages/tdebase/libtaskbar.po
+++ b/tde-i18n-ja/messages/tdebase/libtaskbar.po
@@ -7,7 +7,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-02-27 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -476,6 +476,35 @@ 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 ""
+#~ "このオプションを有効にすると、タスクバーの各エントリに目に見えるフレームを"
+#~ "描画します。\n"
+#~ "\n"
+#~ "このオプションは標準で無効になっています。"
+
+#, 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 ""
+#~ "このオプションを有効にすると、マウスオーバー効果にウィンドウのサムネイルを"
+#~ "描画します。<p>タスクバーの起動中にウィンドウが最小化されているか、異なる"
+#~ "デスクトップにある場合、ウィンドウが復元されるか、適切なデスクトップが有効"
+#~ "にされるまで、アイコンが表示されます。</p>"
+
 #~ msgid "Show application icons"
 #~ msgstr "アプリケーションアイコンを表示"