Merge commit 'upstream/2.31.1'

1 files changed, 145 insertions, 121 deletions

diff --git a/po/sr.po b/po/sr.po
index 24efb5c..041a81d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-03-11 09:46+1100\n"
+"POT-Creation-Date: 2010-04-27 11:43+1000\n"
 "PO-Revision-Date: 2010-01-26 22:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators "
 "<rosetta@launchpad.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -43,233 +43,223 @@ msgstr "A_6"
 msgid "All Pages From _Feeder"
 msgstr "Све странице из _фиоке"
 
-#. Tooltip for preferences button
+#. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
-msgid "Configure application preferences"
+msgid "Back"
 msgstr ""
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
 msgstr ""
 
-#. Tooltip for crop button
-#: ../data/simple-scan.ui.h:15
+#: ../data/simple-scan.ui.h:14
 msgid "Crop the selected page"
 msgstr ""
 
-#. Label on email toolbar item
-#: ../data/simple-scan.ui.h:17
-msgid "Email"
+#. Combo box label for scanning the front side of a page
+#: ../data/simple-scan.ui.h:16
+msgid "Front"
 msgstr ""
 
-#. Tooltip for the email toolbar button
-#: ../data/simple-scan.ui.h:19
-msgid "Email the scanned documents"
+#. Combo box label for scanning both sides of a page
+#: ../data/simple-scan.ui.h:18
+msgid "Front and Back"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:21
+#: ../data/simple-scan.ui.h:20
 msgid "Le_gal"
 msgstr "Америчко писмо"
 
-#: ../data/simple-scan.ui.h:22
+#: ../data/simple-scan.ui.h:21
 msgid "New"
 msgstr ""
 
+#. Label beside page size combo box
+#: ../data/simple-scan.ui.h:23
+msgid "Page Size:"
+msgstr ""
+
 #. Combo box label for photo scan mode
-#: ../data/simple-scan.ui.h:24
+#: ../data/simple-scan.ui.h:25
 msgid "Photo"
 msgstr "Слика"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:26
+#: ../data/simple-scan.ui.h:27
 msgid "Preferences"
 msgstr "Подешавања"
 
-#. Label on print toolbar item
-#: ../data/simple-scan.ui.h:28
-msgid "Print"
-msgstr ""
-
-#. Tooltip for print toolbar button
-#: ../data/simple-scan.ui.h:30
-msgid "Print the scanned documents"
-msgstr ""
-
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:29
 msgid "Rotate Left"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:31
 msgid "Rotate Right"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:33
 msgid "Rotate _Left"
 msgstr "Ротирај _лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:35
 msgid "Rotate _Right"
 msgstr "Ротирај _десно"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:37
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:39
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
-#. Label on save to file toolbar item
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:40
 msgid "Save"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:46
-msgid "Save the current document to a file"
+#: ../data/simple-scan.ui.h:42
+msgid "Save document to a file"
 msgstr ""
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:44
 msgid "Sc_an"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:46
 msgid "Scan"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:48
 msgid "Scan S_ource:"
 msgstr "Извор скенирања"
 
+#. Label beside scan side combo box
+#: ../data/simple-scan.ui.h:50
+msgid "Scan Side:"
+msgstr ""
+
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:52
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:56 ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
 msgid "Simple Scan"
 msgstr "Обично скенирање"
 
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:56
 msgid "Single _Page"
 msgstr "Једна _страна"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:58
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:61
+#: ../data/simple-scan.ui.h:59
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:63
+#: ../data/simple-scan.ui.h:61
 msgid "Stop the current scan"
 msgstr ""
 
 #. Combo box label for text scan mode
-#: ../data/simple-scan.ui.h:65
+#: ../data/simple-scan.ui.h:63
 msgid "Text"
 msgstr "Текст"
 
-#. Tooltip for the toolbar document type combo box
-#: ../data/simple-scan.ui.h:67
-msgid ""
-"The type of document being scanned. Use \"Text\" for quick, medium quality "
-"scans of text documents, or \"Photo\" for slower, higher quality scans of "
-"documents with graphics or photographs."
-msgstr ""
-
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:65
 msgid "_Authorize"
 msgstr "О_власти"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:67
 msgid "_Contents"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:69
 msgid "_Crop"
 msgstr "_Исеци"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:75
+#: ../data/simple-scan.ui.h:71
 msgid "_Custom"
 msgstr "_Кориснички"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:73
 msgid "_Document"
 msgstr "_Документ"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:75
 msgid "_Email"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:77
 msgid "_Help"
 msgstr "_Помоћ"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:79
 msgid "_Letter"
 msgstr "_Летер"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:81
 msgid "_None"
 msgstr "_Ништа"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:83
 msgid "_Page"
 msgstr "_Страна"
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:85
 msgid "_Password:"
 msgstr "_Лозинка:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:87
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:89
 msgid "_Rotate Crop"
 msgstr "Ротирај осечено"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:91
 msgid "_Stop Scan"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:95
 msgid "_Username for resource:"
 msgstr "_Корисничко име за извор:"
 
@@ -290,124 +280,153 @@ msgid "Directory to save files to"
 msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:4
-msgid "Height of scanned image in pixels"
+msgid "Height of paper in tenths of a mm"
 msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:5
-msgid "Resolution for photo scans"
+msgid "Height of scanned image in pixels"
 msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:6
-msgid "Resolution for text scans"
+msgid "Page side to scan"
 msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:7
-msgid "Resolution of last scanned image"
+msgid "Resolution for photo scans"
 msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:8
-msgid "SANE device to acquire images from."
+msgid "Resolution for text scans"
 msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:9
-msgid "TRUE if the application window is maximized"
+msgid "Resolution of last scanned image"
 msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:10
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:11
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:12
 msgid ""
 "The direction of the scanner across the scanned page. It can be one of the "
 "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:11
+#: ../data/simple-scan.schemas.in.h:13
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:12
+#: ../data/simple-scan.schemas.in.h:14
 msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:13
+#: ../data/simple-scan.schemas.in.h:15
+msgid ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:16
+msgid ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:14
+#: ../data/simple-scan.schemas.in.h:18
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:15
+#: ../data/simple-scan.schemas.in.h:19
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:16
+#: ../data/simple-scan.schemas.in.h:20
 msgid ""
 "The width of scanned image in pixels. This value is updated to what the last "
 "scanned page was."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:17
+#: ../data/simple-scan.schemas.in.h:21
+msgid ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:18
+#: ../data/simple-scan.schemas.in.h:23
 msgid ""
 "Type of document being scanned. 'text' for text documents, 'photo' for "
 "photos. This setting decides on the scan resolution, colors and post-"
 "processing."
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:19
+#: ../data/simple-scan.schemas.in.h:24
+msgid "Width of paper in tenths of a mm"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:20
+#: ../data/simple-scan.schemas.in.h:26
 msgid "Window height in pixels"
 msgstr ""
 
-#: ../data/simple-scan.schemas.in.h:21
+#: ../data/simple-scan.schemas.in.h:27
 msgid "Window width in pixels"
 msgstr ""
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.c:852
+#: ../src/scanner.c:889
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.c:879
+#: ../src/scanner.c:916
 msgid "Unable to connect to scanner"
 msgstr "Није могуће повезати се са скенером"
 
 #. Error display when unable to start scan
-#: ../src/scanner.c:1101
+#: ../src/scanner.c:1222
 msgid "Unable to start scan"
 msgstr "Није могуће започети скенирање"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1119 ../src/scanner.c:1212
+#: ../src/scanner.c:1240 ../src/scanner.c:1336
 msgid "Error communicating with scanner"
 msgstr "Грешка у коминикацији са скенером"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:176
+#: ../src/simple-scan.c:262
 msgid "Failed to scan"
 msgstr "Грешка у скенирању"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:194
+#: ../src/simple-scan.c:280
 msgid "Scanned Document"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/simple-scan.c:263
+#: ../src/simple-scan.c:347
 msgid "Failed to save file"
 msgstr "Грешка у снимању датотеке"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:380
+#: ../src/simple-scan.c:471
 #, c-format
 msgid ""
 "Usage:\n"
@@ -417,7 +436,7 @@ msgstr ""
 "  %s [DEVICE...] - алатка за скенирање"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:388
+#: ../src/simple-scan.c:479
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -429,7 +448,7 @@ msgid ""
 msgstr ""
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:400
+#: ../src/simple-scan.c:491
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -453,68 +472,68 @@ msgstr ""
 "  --g-fatal-warnings              Поставља сва упозорења као кобна"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:127
+#: ../src/ui.c:129
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Корисничко име и лозинка су обавезни за приступ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:226
+#: ../src/ui.c:231
 msgid "No scanners detected"
 msgstr "Нема препознатих скенера"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:228
+#: ../src/ui.c:233
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:517
+#: ../src/ui.c:638
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:756
+#: ../src/ui.c:888
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:758
+#: ../src/ui.c:890
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:760
+#: ../src/ui.c:892
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:772
+#: ../src/ui.c:904
 msgid "Save As..."
 msgstr "Сачувај као..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:788
+#: ../src/ui.c:920
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:795
+#: ../src/ui.c:927
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.c:800
+#: ../src/ui.c:932
 msgid "Select File _Type"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:939
+#: ../src/ui.c:1068
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:955
+#: ../src/ui.c:1084
 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"
@@ -543,60 +562,65 @@ msgstr ""
 "заједно са овим програмом. Ако не, види <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:969
+#: ../src/ui.c:1098
 msgid "About Simple Scan"
 msgstr "О Једноставно скенирање"
 
 #. Description of program
-#: ../src/ui.c:972
+#: ../src/ui.c:1101
 msgid "Simple document scanning tool"
 msgstr "Алатка за једноставно скенирање докумената"
 
-#: ../src/ui.c:981
+#: ../src/ui.c:1110
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Ivan Petrovic https://launchpad.net/~ivanpetrovic"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1114
+#: ../src/ui.c:1248
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1116 ../src/ui.c:1117 ../src/ui.c:1118 ../src/ui.c:1121
+#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1120
+#: ../src/ui.c:1254
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1143
+#: ../src/ui.c:1277
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1175
+#: ../src/ui.c:1311
 msgid "Files missing"
 msgstr "Недостају датотеке"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1177
+#: ../src/ui.c:1313
 msgid "Please check your installation"
 msgstr "Проверите вашу инсталацију"
 
+#. Combo box value for automatic paper size
+#: ../src/ui.c:1352
+msgid "Automatic"
+msgstr ""
+
 #. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1339
+#: ../src/ui.c:1508
 msgid "Change _Scanner"
 msgstr ""
 
-#: ../src/ui.c:1463
+#: ../src/ui.c:1651
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"