Merge commit 'upstream/2.31.91'

1 files changed, 21 insertions, 20 deletions

diff --git a/po/es.po b/po/es.po
index 2170e63..3feec14 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-07-11 04:04+0000\n"
+"POT-Creation-Date: 2010-08-20 05:36+0000\n"
 "PO-Revision-Date: 2010-05-29 15:56+0000\n"
 "Last-Translator: Julián Alarcón <alarconj@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-14 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -423,7 +423,7 @@ msgid "Unable to start scan"
 msgstr "No empezar a escanear"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1338
+#: ../src/scanner.c:1240 ../src/scanner.c:1346
 msgid "Error communicating with scanner"
 msgstr "Error comunicándose con el escáner"
 
@@ -562,17 +562,17 @@ msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:949
+#: ../src/ui.c:950
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la imagen previa de la aplicación"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1245
+#: ../src/ui.c:1246
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1260
+#: ../src/ui.c:1261
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -601,16 +601,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1274
+#: ../src/ui.c:1275
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1277
+#: ../src/ui.c:1278
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.c:1286
+#: ../src/ui.c:1287
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -633,63 +633,64 @@ msgstr ""
 "  Vladimir Rojas https://launchpad.net/~vladyrojas\n"
 "  almejo https://launchpad.net/~alejandro-vera\n"
 "  daironmedina https://launchpad.net/~dairon\n"
+"  elXATU https://launchpad.net/~elxatu\n"
 "  felix.anadon@gmail.com https://launchpad.net/~felix-anadon\n"
 "  fosk https://launchpad.net/~oscarrdg"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.c:1304
+#: ../src/ui.c:1305
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1306
+#: ../src/ui.c:1307
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1448
+#: ../src/ui.c:1449
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
+#: ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1453 ../src/ui.c:1456
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1454
+#: ../src/ui.c:1455
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1477
+#: ../src/ui.c:1478
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1522
+#: ../src/ui.c:1523
 msgid "Files missing"
 msgstr "Faltan archivos"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1524
+#: ../src/ui.c:1525
 msgid "Please check your installation"
 msgstr "Verifique su instalación"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1581
+#: ../src/ui.c:1582
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1587
+#: ../src/ui.c:1588
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.c:1865
+#: ../src/ui.c:1866
 msgid "Scanned Document.pdf"
 msgstr "Documento escaneado.pdf"