Merge lp:~dpm/simple-scan/translation-fixes into lp:~robert-ancell/simple-scan/trunk

[David Planella]

[David Planella (dpm)]

Some minor translations-related changes. From the commit log:

Added the POT file to revision control, so that the automatic translation
template imports can work with Launchpad. In the future Launchpad will
implement the feature of automatically regenerating templates, but for now they
must be manually updated and committed for them to be automatically imported.

Used only ASCII chars in the UI file, otherwise translations are not loaded.
See https://bugzilla.gnome.org/show_bug.cgi?id=596205

[Robert Ancell (robert-ancell)]

I've committed the .pot file. I'd like to keep the correct unicode characters (many, many other projects will have this same problem) for now.

review: Approve

[David Planella (dpm)]

Hi Robert,

Thanks for reviewing and merging the branch. However, I still cannot see the .pot file committed in http://bazaar.launchpad.net/~robert-ancell/simple-scan/trunk/files/head%3A/po/ and thus the latest strings added to the UI are not available for translation. Do you think you could update it and commit it, so that translators can translate the latest strings? Thanks!

In time, Rosetta will grow the ability to automatically generate the .pot template, but for now, it needs to be kept under revision control (and updated and committed before releases, so that it gets automatically imported into Launchpad and the latest strings are exposed for translation).

[Robert Ancell (robert-ancell)]

Hmm, didn't work. It is there now.

David Planella wrote:
> Hi Robert,
>
> Thanks for reviewing and merging the branch. However, I still cannot see the .pot file committed in http://bazaar.launchpad.net/~robert-ancell/simple-scan/trunk/files/head%3A/po/ and thus the latest strings added to the UI are not available for translation. Do you think you could update it and commit it, so that translators can translate the latest strings? Thanks!
>
> In time, Rosetta will grow the ability to automatically generate the .pot template, but for now, it needs to be kept under revision control (and updated and committed before releases, so that it gets automatically imported into Launchpad and the latest strings are exposed for translation).
>

=== modified file 'data/simple-scan.ui'
--- data/simple-scan.ui	2009-12-23 03:48:58 +0000
+++ data/simple-scan.ui	2009-12-24 14:13:14 +0000
@@ -223,7 +223,7 @@
                             <child>
                               <object class="GtkRadioMenuItem" id="4x6_menuitem">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4&#xD7;6</property>
+                                <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4x6</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_as_radio">True</property>
                                 <property name="group">no_crop_menuitem</property>

=== added file 'po/simple-scan.pot'
--- po/simple-scan.pot	1970-01-01 00:00:00 +0000
+++ po/simple-scan.pot	2009-12-24 14:13:14 +0000
@@ -0,0 +1,417 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-24 14:59+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Radio button for cropping page to 4x6 inch
+#: ../data/simple-scan.ui.h:2
+msgid "4&#xD7;6"
+msgstr ""
+
+#. Radio button for cropping page to A4 size
+#: ../data/simple-scan.ui.h:4
+msgid "A_4"
+msgstr ""
+
+#. Radio button for cropping page to A5 size
+#: ../data/simple-scan.ui.h:6
+msgid "A_5"
+msgstr ""
+
+#. Radio button for cropping page to A6 size
+#: ../data/simple-scan.ui.h:8
+msgid "A_6"
+msgstr ""
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: ../data/simple-scan.ui.h:10
+msgid "All Pages From _Feeder"
+msgstr ""
+
+#. Label on email toobar item
+#: ../data/simple-scan.ui.h:12
+msgid "Email"
+msgstr ""
+
+#. Tooltip for the email toolbar button
+#: ../data/simple-scan.ui.h:14
+msgid "Email the scanned documents"
+msgstr ""
+
+#. Radio button for cropping to page to US legal size
+#: ../data/simple-scan.ui.h:16
+msgid "Le_gal"
+msgstr ""
+
+#: ../data/simple-scan.ui.h:17
+msgid "New"
+msgstr ""
+
+#. Combo box label for photo scan mode
+#: ../data/simple-scan.ui.h:19
+msgid "Photo"
+msgstr ""
+
+#. Title of preferences dialog
+#: ../data/simple-scan.ui.h:21
+msgid "Preferences"
+msgstr ""
+
+#. Label on print toolbar item
+#: ../data/simple-scan.ui.h:23
+msgid "Print"
+msgstr ""
+
+#. Tooltip for print toolbar button
+#: ../data/simple-scan.ui.h:25
+msgid "Print the scanned documents"
+msgstr ""
+
+#. Label on rotate page left (anti-clockwise) item
+#: ../data/simple-scan.ui.h:27
+msgid "Rotate Left"
+msgstr ""
+
+#. Label on rotate page right (clockwise) item
+#: ../data/simple-scan.ui.h:29
+msgid "Rotate Right"
+msgstr ""
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: ../data/simple-scan.ui.h:31
+msgid "Rotate _Left"
+msgstr ""
+
+#. Menu item to rotate page to right (clockwise)
+#: ../data/simple-scan.ui.h:33
+msgid "Rotate _Right"
+msgstr ""
+
+#. Label on save to file toolbar item
+#: ../data/simple-scan.ui.h:35
+msgid "Save"
+msgstr ""
+
+#. Tooltip for save toolbar button
+#: ../data/simple-scan.ui.h:37
+msgid "Save the current document to a file"
+msgstr ""
+
+#. Label on scan toolbar item
+#: ../data/simple-scan.ui.h:39
+msgid "Scan"
+msgstr ""
+
+#. Label beside scan source combo box
+#: ../data/simple-scan.ui.h:41
+msgid "Scan S_ource:"
+msgstr ""
+
+#. Tooltip for scan toolbar button
+#: ../data/simple-scan.ui.h:43
+msgid "Scan a single page from the scanner"
+msgstr ""
+
+#. Title of scan window
+#: ../data/simple-scan.ui.h:45 ../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:47
+msgid "Single _Page"
+msgstr ""
+
+#. Tooltip for new document button
+#: ../data/simple-scan.ui.h:49
+msgid "Start a new document"
+msgstr ""
+
+#. Combo box label for text scan mode
+#: ../data/simple-scan.ui.h:51
+msgid "Text"
+msgstr ""
+
+#. Tooltip for the toolbar document type combo box
+#: ../data/simple-scan.ui.h:53
+msgid ""
+"The type of document being scanned.  This changes the time taken to scan and "
+"the quality of the scanned data."
+msgstr ""
+
+#. Button to submit authorization dialog
+#: ../data/simple-scan.ui.h:55
+msgid "_Authorize"
+msgstr ""
+
+#. Label for page crop submenu
+#: ../data/simple-scan.ui.h:57
+msgid "_Crop"
+msgstr ""
+
+#. Radio button for cropping to custom page size
+#: ../data/simple-scan.ui.h:59
+msgid "_Custom"
+msgstr ""
+
+#. Label on page delete menuitem
+#: ../data/simple-scan.ui.h:61
+msgid "_Delete"
+msgstr ""
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: ../data/simple-scan.ui.h:63
+msgid "_Document"
+msgstr ""
+
+#. Label on help menu
+#: ../data/simple-scan.ui.h:65
+msgid "_Help"
+msgstr ""
+
+#. Radio button for cropping page to US letter size
+#: ../data/simple-scan.ui.h:67
+msgid "_Letter"
+msgstr ""
+
+#. Radio button for no crop
+#: ../data/simple-scan.ui.h:69
+msgid "_None"
+msgstr ""
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: ../data/simple-scan.ui.h:71
+msgid "_Page"
+msgstr ""
+
+#. Label beside password entry
+#: ../data/simple-scan.ui.h:73
+msgid "_Password:"
+msgstr ""
+
+#. Check button to delete all existing pages on a new scan when enabled
+#: ../data/simple-scan.ui.h:75
+msgid "_Replace current pages"
+msgstr ""
+
+#. Menu item to rotate the crop area
+#: ../data/simple-scan.ui.h:77
+msgid "_Rotate Crop"
+msgstr ""
+
+#. Menu entry to stop current scan
+#: ../data/simple-scan.ui.h:79
+msgid "_Stop Scan"
+msgstr ""
+
+#. Label beside username entry
+#: ../data/simple-scan.ui.h:81
+msgid "_Username for resource:"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:1
+msgid "Scan Documents"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:1
+msgid "Device to scan from"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:2
+msgid "Direction of scan"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:3
+msgid "SANE device to acquire images from."
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:4
+msgid "TRUE if the application window is maximized"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:5
+msgid "TRUE if the document is cleared on each scan"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:6
+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:7
+msgid "Type of document being scanned"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:8
+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:9
+msgid "Window height in pixels"
+msgstr ""
+
+#: ../data/simple-scan.schemas.in.h:10
+msgid "Window width in pixels"
+msgstr ""
+
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.c:557
+#, c-format
+msgid "Unable to connect to scanner"
+msgstr ""
+
+#. Error display when unable to start scan
+#: ../src/scanner.c:695
+#, c-format
+msgid "Unable to start scan"
+msgstr ""
+
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.c:708 ../src/scanner.c:749
+#, c-format
+msgid "Error communicating with scanner"
+msgstr ""
+
+#. Warning displayed when no scanners are detected
+#: ../src/simple-scan.c:61
+msgid "No scanners detected"
+msgstr ""
+
+#. Hint to user on why there are no scanners detected
+#: ../src/simple-scan.c:63
+msgid "Please check your scanner is connected and powered on"
+msgstr ""
+
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.c:162
+msgid "Failed to scan"
+msgstr ""
+
+#. Default name for PDF documents
+#: ../src/simple-scan.c:180 ../src/ui.c:1177
+msgid "Scanned Document.pdf"
+msgstr ""
+
+#. Default name for JPEG documents
+#: ../src/simple-scan.c:183 ../src/simple-scan.c:189
+msgid "Scanned Document.jpeg"
+msgstr ""
+
+#. Default name for PNG documents
+#: ../src/simple-scan.c:186
+msgid "Scanned Document.png"
+msgstr ""
+
+#. Title of error dialog when save failed
+#: ../src/simple-scan.c:251
+msgid "Failed to save file"
+msgstr ""
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:336
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DEVICE...] - Scanning utility"
+msgstr ""
+
+#. Description on how to use simple-scan displayed on command-line
+#: ../src/simple-scan.c:344
+#, c-format
+msgid ""
+"Help Options:\n"
+"  -d, --debug                     Print debugging messages\n"
+"  -v, --version                   Show release version\n"
+"  -h, --help                      Show help options\n"
+"  --help-all                      Show all help options\n"
+"  --help-gtk                      Show GTK+ options"
+msgstr ""
+
+#. Description on simple-scan command-line GTK+ options displayed on command-line
+#: ../src/simple-scan.c:356
+#, c-format
+msgid ""
+"GTK+ Options:\n"
+"  --class=CLASS                   Program class as used by the window "
+"manager\n"
+"  --name=NAME                     Program name as used by the window "
+"manager\n"
+"  --screen=SCREEN                 X screen to use\n"
+"  --sync                          Make X calls synchronous\n"
+"  --gtk-module=MODULES            Load additional GTK+ modules\n"
+"  --g-fatal-warnings              Make all warnings fatal"
+msgstr ""
+
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.c:118
+#, c-format
+msgid "Username and password required to access '%s'"
+msgstr ""
+
+#. Title of save dialog
+#: ../src/ui.c:549
+msgid "Save As..."
+msgstr ""
+
+#. The license this software is under (GPL3+)
+#: ../src/ui.c:760
+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"
+"the Free Software Foundation, either version 3 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#. Title of about dialog
+#: ../src/ui.c:774
+msgid "About Simple Scan"
+msgstr ""
+
+#. Description of program
+#: ../src/ui.c:777
+msgid "Simple document scanning tool"
+msgstr ""
+
+#: ../src/ui.c:785
+msgid "translator-credits"
+msgstr ""
+
+#. Title of dialog when cannot load required files
+#: ../src/ui.c:902
+msgid "Files missing"
+msgstr ""
+
+#. Description in dialog when cannot load required files
+#: ../src/ui.c:904
+msgid "Please check your installation"
+msgstr ""
+
+#. Button in error dialog to open prefereces dialog and change scanner
+#: ../src/ui.c:1053
+msgid "Change _Scanner"
+msgstr ""