From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 2 Jul 2009 19:16:48 +0000 (+0000)
Subject: Merge changes from 1.4.0 r8744.
X-Git-Tag: release-1.6.3~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60198c6dbab341b775f2f44d811b8f584ab7f0b4;p=thirdparty%2Fcups.git

Merge changes from 1.4.0 r8744.


git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1603 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 587abe4af..cd771ba82 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@ CHANGES.txt - 2009-07-02
 
 CHANGES IN CUPS V1.4.0
 
-	- Localization updates (STR #3223, STR #3246)
+	- Localization updates (STR #3223, STR #3246, STR #3248)
 	- Documentation updates (STR #3225, STR #3230)
 	- The web interface didn't show the default options (STR #3244)
 	- The IPP and LPD backends needed print data before they would do an
diff --git a/locale/cups_es.po b/locale/cups_es.po
index 8853c41c1..e71bc6aef 100644
--- a/locale/cups_es.po
+++ b/locale/cups_es.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: CUPS 1.4\n"
 "Report-Msgid-Bugs-To: http://www.cups.org/str.php\n"
 "POT-Creation-Date: 2009-06-18 15:43-0700\n"
-"PO-Revision-Date: 2009-06-14 21:00+0100\n"
+"PO-Revision-Date: 2009-07-02 20:00+0100\n"
 "Last-Translator: Juan Pablo González Riopedre <riopedre13@yahoo.es>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -3497,7 +3497,7 @@ msgid "Name OID uses indefinite length"
 msgstr "Nombre OID usa una longitud indefinida"
 
 msgid "Nested classes are not allowed!"
-msgstr ""
+msgstr "No se permiten clases anidadas."
 
 msgid "Never"
 msgstr "Nunca"
@@ -5687,9 +5687,3 @@ msgstr "sin título"
 msgid "variable-bindings uses indefinite length"
 msgstr "variable-bindings usa una longitud indefinida"
 
-#~ msgid ""
-#~ "ERROR: Missing device URI on command-line and no DEVICE_URI environment "
-#~ "variable!\n"
-#~ msgstr ""
-#~ "ERROR: Falta URI del dispositivo en la línea de comandos y no hay "
-#~ "variable de entorno DEVICE_URI.\n"