Merge commit 'upstream/2.31.90.2'

1 files changed, 43 insertions, 37 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 50fe33f..0dd4453 100644
--- a/po/en_GB.po
+++ b/po/en_GB.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"
-"PO-Revision-Date: 2010-03-23 12:03+0000\n"
-"Last-Translator: Alex Denvir <coldfff@blueyonder.co.uk>\n"
+"POT-Creation-Date: 2010-08-16 06:40+0000\n"
+"PO-Revision-Date: 2010-08-15 13:46+0000\n"
+"Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@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-16 06:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "All Pages From _Feeder"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Back"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Crop the selected page"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Front"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Front and Back"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "New"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Page Size:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@ msgstr "Save"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Save document to a file"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@ msgstr "Scan S_ource:"
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Scan Side:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@ msgstr "Directory to save files to"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Height of paper in tenths of a mm"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@ msgstr "Height of scanned image in pixels"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Page side to scan"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -336,11 +336,14 @@ msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"The height of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -367,6 +370,8 @@ msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"The width of the paper in tenths of a mm (or 0 for automatic paper "
+"detection)."
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -384,7 +389,7 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Width of paper in tenths of a mm"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -414,7 +419,7 @@ msgid "Unable to start scan"
 msgstr "Unable to start scan"
 
 #. 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 communicating with scanner"
 
@@ -539,30 +544,30 @@ msgstr "Failed to save file"
 #. 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 ""
+msgstr "If you don't save, changes will be permanently lost."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Discard Changes"
 
 #. Error message display when unable to preview image
-#: ../src/ui.c:949
+#: ../src/ui.c:950
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1245
+#: ../src/ui.c:1246
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. 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"
@@ -591,78 +596,79 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1274
+#: ../src/ui.c:1275
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.c:1277
+#: ../src/ui.c:1278
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.c:1286
+#: ../src/ui.c:1287
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alex Denvir https://launchpad.net/~coldfff\n"
 "  Jonathon Hodges https://launchpad.net/~jonblondie\n"
+"  Kaustav Das Modak https://launchpad.net/~kaustav-dasmodak\n"
 "  Malcolm Parsons https://launchpad.net/~malcolm-parsons\n"
 "  solar.george https://launchpad.net/~solar.george"
 
 #. 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 ""
+msgstr "Save document before quitting?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.c:1306
+#: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Quit without Saving"
 
 #. 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 dpi (draft)"
 
 #. 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 dpi"
 
 #. 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 dpi (high resolution)"
 
 #. 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 dpi (default)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1522
+#: ../src/ui.c:1523
 msgid "Files missing"
 msgstr "Files missing"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1524
+#: ../src/ui.c:1525
 msgid "Please check your installation"
 msgstr "Please check your installation"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.c:1581
+#: ../src/ui.c:1582
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1587
+#: ../src/ui.c:1588
 msgid "Automatic"
-msgstr ""
+msgstr "Automatic"
 
-#: ../src/ui.c:1865
+#: ../src/ui.c:1866
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"