Merge commit 'upstream/2.31.5.bzr424'

1 files changed, 72 insertions, 47 deletions

diff --git a/po/sk.po b/po/sk.po
index 00f7a6e..4d0c312 100644
--- a/po/sk.po
+++ b/po/sk.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-04-27 11:43+1000\n"
+"POT-Creation-Date: 2010-07-06 22:07+0000\n"
 "PO-Revision-Date: 2010-02-13 20:04+0000\n"
 "Last-Translator: Laco Gubík <Unknown>\n"
 "Language-Team: Slovak <sk@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-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -414,27 +414,22 @@ msgid "Unable to start scan"
 msgstr "Nie je možné začať skenovať"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
 msgstr "Chyba v komunikácii so skenerom"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
 msgstr "Skenovanie zlyhalo"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
 msgstr ""
 
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Ukladanie súboru zlyhalo"
-
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
@@ -444,7 +439,7 @@ msgstr ""
 "  %s [ZARIADENIE...] - Skenovacia pomôcka"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -462,7 +457,7 @@ msgstr ""
 "  --help-gtk Zobraziť GTK+ možnosti"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -484,68 +479,88 @@ msgstr ""
 "  --g-fatal-warnings Zmeniť všetky upozornenia na terminálne"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
 msgstr "Žiadne skenery neboli nájdené"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím skontrolujte či je skener pripojený a zapnutý"
 
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr ""
-
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr ""
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Ukladanie súboru zlyhalo"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:594
+msgid "Save current document?"
+msgstr ""
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr ""
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -575,66 +590,76 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  6205 https://launchpad.net/~6205-deactivatedaccount\n"
-"  Laco Gubík https://launchpad.net/~lacogubik-gmail"
+"  Laco Gubík https://launchpad.net/~laco"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr ""
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Chýbajúce súbory"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
 msgstr "Prosím skontrolujte vašu inštaláciu"
 
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Zmeniť _skener"
+
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
 msgstr ""
 
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Zmeniť _skener"
-
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"