Merge commit 'upstream/3.1.5'

1 files changed, 24 insertions, 88 deletions

diff --git a/help/POT/POT.po b/help/POT/POT.po
index 97044bd..9a2bebb 100644
--- a/help/POT/POT.po
+++ b/help/POT/POT.po
@@ -1,11 +1,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-21 16:02+1000\n"
+"POT-Creation-Date: 2011-06-12 20:11+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,9 +30,7 @@ msgid "Open <app>Simple Scan</app>."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/scanning.page:27(p)
-msgid ""
-"Press the scan button in the toolbar (or <keyseq><key>Ctrl</key><key>1</"
-"key></keyseq>)."
+msgid "Press the scan button in the toolbar (or <keyseq><key>Ctrl</key><key>1</key></keyseq>)."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/scanning.page:33(p)
@@ -41,19 +38,11 @@ msgid "The page will be shown as it is scanned."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/scanning.page:37(p)
-msgid ""
-"Each page you scan is added to the end of your document. To start a new "
-"document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. "
-"Individual pages can be deleted by right clicking a page or pressing the "
-"<key>Delete</key> key."
+msgid "Each page you scan is added to the end of your document. To start a new document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>. Individual pages can be deleted by right clicking a page or pressing the <key>Delete</key> key."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/scanning.page:42(p)
-msgid ""
-"The type of scan can be changed from the <guiseq><gui>Document</"
-"gui><gui>Scan</gui></guiseq> menu. Choose <gui>Text</gui> if you want the "
-"document to be quickly scanned in black and white or <gui>Photo</gui> for a "
-"high resolution color scan."
+msgid "The type of scan can be changed from the <guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu. Choose <gui>Text</gui> if you want the document to be quickly scanned in black and white or <gui>Photo</gui> for a high resolution color scan."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/scanning.page:47(p)
@@ -65,17 +54,11 @@ msgid "Selecting a Scanner"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/scanner.page:11(p)
-msgid ""
-"If you have multiple scanners you can change which scanner is selected from "
-"the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
+msgid "If you have multiple scanners you can change which scanner is selected from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/scanner.page:15(p)
-msgid ""
-"Your local scanners are automatically detected each time you start "
-"<app>Simple Scan</app> and each time you plug in USB scanner. If you have a "
-"network scanner you will need to restart <app>Simple Scan</app> for it to be "
-"detected."
+msgid "Your local scanners are automatically detected each time you start <app>Simple Scan</app> and each time you plug in USB scanner. If you have a network scanner you will need to restart <app>Simple Scan</app> for it to be detected."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:9(title)
@@ -83,10 +66,7 @@ msgid "Saving to a File"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:11(p)
-msgid ""
-"To save the current document to a file use the <guiseq><gui>Document</"
-"gui><gui>Save</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>S</key></"
-"keyseq>). When you save, there is a choice of three file types."
+msgid "To save the current document to a file use the <guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>S</key></keyseq>). When you save, there is a choice of three file types."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:17(title)
@@ -94,10 +74,7 @@ msgid "Portable Document Format (PDF)"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:18(p)
-msgid ""
-"A PDF can contain multiple pages (like a book) and is easy to distribute to "
-"other people. Most people do not have software to modify PDF documents so "
-"this format is best used for archiving."
+msgid "A PDF can contain multiple pages (like a book) and is easy to distribute to other people. Most people do not have software to modify PDF documents so this format is best used for archiving."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:19(p)
@@ -109,11 +86,7 @@ msgid "JPEG"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:23(p)
-msgid ""
-"JPEG file is the file format used by digital cameras and is very small and "
-"so easy to distribute. Most people have software to modify JPEG photos and "
-"this format is suitable for uploading to social networking sites. If you "
-"have scanned multiple pages then a JPEG file will be written for each page."
+msgid "JPEG file is the file format used by digital cameras and is very small and so easy to distribute. Most people have software to modify JPEG photos and this format is suitable for uploading to social networking sites. If you have scanned multiple pages then a JPEG file will be written for each page."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:24(p)
@@ -125,10 +98,7 @@ msgid "PNG"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:28(p)
-msgid ""
-"PNG files contain the raw data from the scanner. This makes them much larger "
-"than JPEG files and not suitable for distributing. If you have scanned "
-"multiple pages then a PNG file will be written for each page."
+msgid "PNG files contain the raw data from the scanner. This makes them much larger than JPEG files and not suitable for distributing. If you have scanned multiple pages then a PNG file will be written for each page."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/save.page:29(p)
@@ -140,10 +110,7 @@ msgid "Rotating Pages"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/rotate.page:11(p)
-msgid ""
-"To rotate a page use the rotation buttons in the toolbar or the <key>[</key> "
-"and <key>]</key> keys. Each new page that is scanned will use the previous "
-"rotation."
+msgid "To rotate a page use the rotation buttons in the toolbar or the <key>[</key> and <key>]</key> keys. Each new page that is scanned will use the previous rotation."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/reorder.page:9(title)
@@ -151,9 +118,7 @@ msgid "Reordering Pages"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/reorder.page:11(p)
-msgid ""
-"To move a page, select it and move the page left or right using the <key>&lt;"
-"</key> and <key>&gt;</key> keys."
+msgid "To move a page, select it and move the page left or right using the <key>&lt;</key> and <key>&gt;</key> keys."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/reorder.page:14(p)
@@ -165,9 +130,7 @@ msgid "Printing"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/print.page:11(p)
-msgid ""
-"To print the current document use the <guiseq><gui>Document</gui><gui>Print</"
-"gui></guiseq> menu (<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
+msgid "To print the current document use the <guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>P</key></keyseq>)."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/email.page:9(title)
@@ -175,17 +138,11 @@ msgid "Sending via Email"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/email.page:11(p)
-msgid ""
-"To email the current document use the <guiseq><gui>Document</gui><gui>Email</"
-"gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your "
-"email program will be opened with a new message containing the scanned "
-"document as an attachment."
+msgid "To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with a new message containing the scanned document as an attachment."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/email.page:15(p)
-msgid ""
-"If the document type is set to text the email will have a PDF attachment "
-"otherwise the email will have a JPEG attachment for each page."
+msgid "If the document type is set to text the email will have a PDF attachment otherwise the email will have a JPEG attachment for each page."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/email.page:18(p)
@@ -197,10 +154,7 @@ msgid "Setting the Scan Resolution"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/dpi.page:11(p)
-msgid ""
-"By default text documents will be scanned at 200 dots per inch (dpi) and "
-"photos at 400 dpi. To change these settings open the preferences from the "
-"<guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
+msgid "By default text documents will be scanned at 200 dots per inch (dpi) and photos at 400 dpi. To change these settings open the preferences from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/crop.page:9(title)
@@ -208,22 +162,15 @@ msgid "Cropping"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/crop.page:11(p)
-msgid ""
-"To use only part of the scanned page enable crop by selecting the crop "
-"button in the toolbar. A mask will be shown over the current page with the "
-"area not being used shown in gray."
+msgid "To use only part of the scanned page enable crop by selecting the crop button in the toolbar. A mask will be shown over the current page with the area not being used shown in gray."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/crop.page:15(p)
-msgid ""
-"The crop area can be adjusted by clicking on the inside of the crop area "
-"border and dragging the mouse."
+msgid "The crop area can be adjusted by clicking on the inside of the crop area border and dragging the mouse."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/crop.page:18(p)
-msgid ""
-"Fixed crop sizes can be chosen from the <guiseq><gui>Page</gui><gui>Crop</"
-"gui></guiseq> menu that match commonly used paper sizes."
+msgid "Fixed crop sizes can be chosen from the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly used paper sizes."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/crop.page:21(p)
@@ -235,17 +182,11 @@ msgid "Using an Automatic Document Feeder"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/adf.page:11(p)
-msgid ""
-"If your scanner has an Automatic Document Feeder (ADF) you can scan all the "
-"pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All "
-"Pages From Feeder</gui></guiseq> menu."
+msgid "If your scanner has an Automatic Document Feeder (ADF) you can scan all the pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq> menu."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/adf.page:14(p)
-msgid ""
-"By default both sides of the paper will be scanned if your scanned supports "
-"this. Single side scanning can be configured from the <guiseq><gui>Document</"
-"gui><gui>Preferences</gui></guiseq> menu."
+msgid "By default both sides of the paper will be scanned if your scanned supports this. Single side scanning can be configured from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/index.page:7(name)
@@ -273,20 +214,15 @@ msgid "Using the Document"
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/legal.xml:3(p)
-msgid ""
-"This work is licensed under a <link href=\"http://creativecommons.org/"
-"licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported "
-"License</link>."
+msgid "This work is licensed under a <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Creative Commons Attribution-Share Alike 3.0 Unported License</link>."
 msgstr ""
 
 #: /home/bob/bzr/simple-scan/help/C/legal.xml:6(p)
-msgid ""
-"As a special exception, the copyright holders give you permission to copy, "
-"modify, and distribute the example code contained in this document under the "
-"terms of your choosing, without restriction."
+msgid "As a special exception, the copyright holders give you permission to copy, modify, and distribute the example code contained in this document under the terms of your choosing, without restriction."
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
 #: /home/bob/bzr/simple-scan/help/C/legal.xml:0(None)
 msgid "translator-credits"
 msgstr ""
+