Merge translation files from master branch.

5 files changed, 0 insertions, 34 deletions

diff --git a/tde-i18n-es/messages/tdelibs/katepart.po b/tde-i18n-es/messages/tdelibs/katepart.po
index e7ac74ec113..e4421950b40 100644
--- a/tde-i18n-es/messages/tdelibs/katepart.po
+++ b/tde-i18n-es/messages/tdelibs/katepart.po
@@ -1741,9 +1741,6 @@ msgstr "document.insertText:Tres parámetros necesarios (línea,columna,texto)"
 
 #: part/kateluaindentscript.cpp:156
 #, fuzzy
-#| msgid ""
-#| "document.removeText:Three parameters needed (line,col,text) (number,"
-#| "number,string)"
 msgid ""
 "document.insertText:Three parameters needed (line,col,text) (number,number,"
 "string)"
diff --git a/tde-i18n-es/messages/tdelibs/tdeio.po b/tde-i18n-es/messages/tdelibs/tdeio.po
index e4d0314b111..d1f786d48b7 100644
--- a/tde-i18n-es/messages/tdelibs/tdeio.po
+++ b/tde-i18n-es/messages/tdelibs/tdeio.po
@@ -3768,11 +3768,6 @@ msgstr ""
 
 #: tdeio/global.cpp:691
 #, fuzzy
-#| msgid ""
-#| "You may perform a search on the Internet for a TDE program (called a "
-#| "tdeioslave or ioslave) which supports this protocol. Places to search "
-#| "include <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a "
-#| "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
 msgid ""
 "You may perform a search on the Trinity website for a TDE program (called a "
 "tdeioslave, ioslave or tdeio) which supports this protocol. Places to search "
@@ -5440,7 +5435,6 @@ msgstr "No se pudo encontrar el programa \"umount\""
 
 #: ../tdeioslave/file/file.cpp:1655
 #, fuzzy
-#| msgid "Unknown Error"
 msgid "Unknown unmount error."
 msgstr "Error desconocido"
 
@@ -5926,7 +5920,6 @@ msgstr ""
 
 #: ../tdeioslave/iso/tdeiso_info.cpp:50
 #, fuzzy
-#| msgid "TDE SSL Information"
 msgid "TDE ISO information utility"
 msgstr "Información SSL de TDE"
 
diff --git a/tde-i18n-es/messages/tdelibs/tdelibs.po b/tde-i18n-es/messages/tdelibs/tdelibs.po
index cf9739a5658..1cdb3109b45 100644
--- a/tde-i18n-es/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-es/messages/tdelibs/tdelibs.po
@@ -4373,7 +4373,6 @@ msgstr "Por favor contacte con el administrador de su sistema."
 
 #: tdecore/tdeglobalsettings.cpp:147
 #, fuzzy
-#| msgid "Desktop %1"
 msgid "Desktop"
 msgstr "Escritorio %1"
 
@@ -4400,7 +4399,6 @@ msgstr "Plantillas"
 
 #: tdecore/tdeglobalsettings.cpp:203
 #, fuzzy
-#| msgid "Video"
 msgid "Videos"
 msgstr "Vídeo"
 
@@ -5264,9 +5262,6 @@ msgstr ""
 
 #: tdecore/tdehw/tdestoragedevice.cpp:1055
 #, fuzzy
-#| msgid ""
-#| "Cannot create the file\n"
-#| "\""
 msgid "Cannot create temporary password file"
 msgstr ""
 "No se puede crear el archivo\n"
diff --git a/tde-i18n-es/messages/tdelibs/tdeprint.po b/tde-i18n-es/messages/tdelibs/tdeprint.po
index e31c0f85d69..4ea8e2aa231 100644
--- a/tde-i18n-es/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-es/messages/tdelibs/tdeprint.po
@@ -1662,24 +1662,6 @@ msgstr ""
 
 #: cups/kptextpage.cpp:108
 #, fuzzy
-#| msgid ""
-#| " <qt>  <p><b>Margins</b></p>  <p>These settings control the margins of "
-#| "printouts on the paper. They are not valid for  jobs originating from "
-#| "applications which define their own page layout internally and  send "
-#| "PostScript to TDEPrint (such as KOffice or OpenOffice.org). </p>  <p>When "
-#| "printing from TDE applications, such as KMail and Konqueror, or printing "
-#| "an ASCII text  file through kprinter, you can choose your preferred "
-#| "margin settings here. </p>  <p>Margins may be set individually for each "
-#| "edge of the paper. The combo box at the bottom lets you change  the units "
-#| "of measurement between Pixels, Millimeters, Centimeters, and Inches. </"
-#| "p>  <p>You can even use the mouse to grab one margin and drag it to the "
-#| "intended position (see the  preview picture on the right side). </p>  "
-#| "<hr>  <p><em><b>Additional hint for power users:</b> This TDEPrint GUI "
-#| "element matches  with the CUPS commandline job option parameter:</em>  "
-#| "<pre>     -o page-top=...      # example: \"72\"  <br>     -o page-"
-#| "bottom=...   # example: \"24\"  <br>     -o page-left=...     # example: "
-#| "\"36\"  <br>     -o page-right=...    # example: \"12\"  </pre> </p>  </"
-#| "qt>"
 msgid ""
 " <qt>  <p><b>Margins</b></p>  <p>These settings control the margins of "
 "printouts on the paper. They are not valid for  jobs originating from "
diff --git a/tde-i18n-es/messages/tdelibs/timezones.po b/tde-i18n-es/messages/tdelibs/timezones.po
index 785d2eed243..6c858e6fc04 100644
--- a/tde-i18n-es/messages/tdelibs/timezones.po
+++ b/tde-i18n-es/messages/tdelibs/timezones.po
@@ -690,7 +690,6 @@ msgstr "América/North_Dakota/Center"
 
 #: TIMEZONES:159
 #, fuzzy
-#| msgid "America/Jujuy"
 msgid "America/Nuuk"
 msgstr "América/Jujuy"