Merge translation files from master branch.

1 files changed, 0 insertions, 45 deletions

diff --git a/tde-i18n-es/messages/tdebase/kcmtaskbar.po b/tde-i18n-es/messages/tdebase/kcmtaskbar.po
index 489f7c0c07c..2c22c997e46 100644
--- a/tde-i18n-es/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-es/messages/tdebase/kcmtaskbar.po
@@ -216,13 +216,11 @@ msgstr "Editar la configuración global de la barra de tareas flotante"
 
 #: kcmtaskbarui.ui:117
 #, fuzzy, no-c-format
-#| msgid "Taskbar"
 msgid "&Tasks"
 msgstr "Barra de tareas"
 
 #: kcmtaskbarui.ui:136
 #, fuzzy, no-c-format
-#| msgid "Dis&play:"
 msgid "Display"
 msgstr "Monitor:"
 
@@ -233,11 +231,6 @@ msgstr "&Mostrar ventanas de todos los escritorios"
 
 #: kcmtaskbarui.ui:153
 #, fuzzy, no-c-format
-#| 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 "
@@ -254,11 +247,6 @@ msgstr "&Ordenar ventanas por escritorio"
 
 #: kcmtaskbarui.ui:184
 #, fuzzy, no-c-format
-#| 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."
@@ -275,11 +263,6 @@ msgstr "&Mostrar ventanas de todos los escritorios"
 
 #: kcmtaskbarui.ui:198
 #, fuzzy, no-c-format
-#| 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, "
@@ -297,12 +280,6 @@ msgstr "Mostrar sólo ventanas mi&nimizadas"
 
 #: kcmtaskbarui.ui:209
 #, fuzzy, no-c-format
-#| 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 "
@@ -320,9 +297,6 @@ msgstr "Mostrar tareas y estado:"
 
 #: kcmtaskbarui.ui:253
 #, fuzzy, no-c-format
-#| msgid ""
-#| "The taskbar can show and/or hide tasks based on their current process "
-#| "state.  Select <em>Any</em> to show all tasks regardless of current state."
 msgid ""
 "The taskbar can show and/or hide tasks based on their current process state. "
 "Select <em>Any</em> to show all tasks regardless of current state."
@@ -364,17 +338,6 @@ msgstr "A&grupar tareas similares:"
 
 #: kcmtaskbarui.ui:377
 #, fuzzy, no-c-format
-#| 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 "
@@ -398,7 +361,6 @@ msgstr ""
 
 #: kcmtaskbarui.ui:423
 #, fuzzy, no-c-format
-#| msgid "A&ppearance:"
 msgid "&Appearance"
 msgstr "A&pariencia:"
 
@@ -458,7 +420,6 @@ msgstr ""
 
 #: kcmtaskbarui.ui:661
 #, fuzzy, no-c-format
-#| msgid "Icons only"
 msgid "Icons"
 msgstr "Solo iconos"
 
@@ -483,9 +444,6 @@ msgstr ""
 
 #: kcmtaskbarui.ui:739
 #, fuzzy, no-c-format
-#| msgid ""
-#| "Selecting this option causes the taskbar to use the global taskbar "
-#| "configuration."
 msgid "Selecting this option makes the taskbar use small icons."
 msgstr ""
 "Al seleccionar esta opción, la barra de tareas utiliza la configuración "
@@ -508,7 +466,6 @@ msgstr ""
 
 #: kcmtaskbarui.ui:829
 #, fuzzy, no-c-format
-#| msgid "Taskbar"
 msgid "Taskbar style:"
 msgstr "Barra de tareas"
 
@@ -529,13 +486,11 @@ msgstr ""
 
 #: kcmtaskbarui.ui:943
 #, fuzzy, no-c-format
-#| msgid "Actions"
 msgid "A&ctions"
 msgstr "Acciones"
 
 #: kcmtaskbarui.ui:962
 #, fuzzy, no-c-format
-#| msgid "Actions"
 msgid "Mouse Actions"
 msgstr "Acciones"