Merge commit 'upstream/2.32.0.2'

25 files changed, 139 insertions, 320 deletions

diff --git a/help/Makefile.in b/help/Makefile.in
index 248730a..2cd8f12 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -584,7 +584,7 @@ _db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
 _malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
 _chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
 _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
 @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
 @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
 @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
diff --git a/help/POT/POT.po b/help/POT/POT.po
index e5a0ee4..97044bd 100644
--- a/help/POT/POT.po
+++ b/help/POT/POT.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-22 10:11+1100\n"
+"POT-Creation-Date: 2011-04-21 16:02+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"
@@ -30,7 +31,9 @@ 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)
@@ -38,11 +41,19 @@ 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)
@@ -54,11 +65,17 @@ 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)
@@ -66,7 +83,10 @@ 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)
@@ -74,7 +94,10 @@ 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)
@@ -86,7 +109,11 @@ 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)
@@ -98,7 +125,10 @@ 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)
@@ -110,7 +140,10 @@ 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)
@@ -118,7 +151,9 @@ 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)
@@ -130,7 +165,9 @@ 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)
@@ -138,11 +175,17 @@ 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)
@@ -154,7 +197,10 @@ 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)
@@ -162,15 +208,22 @@ 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)
@@ -182,11 +235,17 @@ 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)
@@ -214,15 +273,20 @@ 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 ""
-
diff --git a/help/POT/adf.page b/help/POT/adf.page
index f8d527a..3b4880f 100644
--- a/help/POT/adf.page
+++ b/help/POT/adf.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#acquire"/>
diff --git a/help/POT/crop.page b/help/POT/crop.page
index 1b08f57..ed89567 100644
--- a/help/POT/crop.page
+++ b/help/POT/crop.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#modify"/>
diff --git a/help/POT/dpi.page b/help/POT/dpi.page
index 4d2ac42..ef4594b 100644
--- a/help/POT/dpi.page
+++ b/help/POT/dpi.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#acquire"/>
diff --git a/help/POT/email.page b/help/POT/email.page
index ab4e829..6432fad 100644
--- a/help/POT/email.page
+++ b/help/POT/email.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#use"/>
diff --git a/help/POT/index.page b/help/POT/index.page
index ee74f28..cd52c54 100644
--- a/help/POT/index.page
+++ b/help/POT/index.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="POT">
 
 	<info>
 		<credit type="author">
diff --git a/help/POT/print.page b/help/POT/print.page
index aaf6baa..78c5f43 100644
--- a/help/POT/print.page
+++ b/help/POT/print.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#use"/>
diff --git a/help/POT/reorder.page b/help/POT/reorder.page
index b353801..6b93169 100644
--- a/help/POT/reorder.page
+++ b/help/POT/reorder.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#modify"/>
diff --git a/help/POT/rotate.page b/help/POT/rotate.page
index 2891582..22b3843 100644
--- a/help/POT/rotate.page
+++ b/help/POT/rotate.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#modify"/>
diff --git a/help/POT/save.page b/help/POT/save.page
index bced8ec..e5a1e0c 100644
--- a/help/POT/save.page
+++ b/help/POT/save.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#use"/>
diff --git a/help/POT/scanner.page b/help/POT/scanner.page
index 70935c8..59820aa 100644
--- a/help/POT/scanner.page
+++ b/help/POT/scanner.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="POT">
 
     <info>
         <link type="guide" xref="index#acquire"/>
diff --git a/help/POT/scanning.page b/help/POT/scanning.page
index 01ab072..ba34430 100644
--- a/help/POT/scanning.page
+++ b/help/POT/scanning.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="POT">
 
     <info>
         <title type="sort">0</title>
diff --git a/help/de/adf.page b/help/de/adf.page
index f8d527a..ebd609b 100644
--- a/help/de/adf.page
+++ b/help/de/adf.page
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="adf" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Using an Automatic Document Feeder</title>
+	<title>Verwendung eines automatischen Dokumenteneinzugs</title>
 
     <p>
     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.
diff --git a/help/de/crop.page b/help/de/crop.page
index 1b08f57..16af258 100644
--- a/help/de/crop.page
+++ b/help/de/crop.page
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="crop" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Cropping</title>
+	<title>Zuschneiden</title>
 
-    <p>
-    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.
-    </p>
-    <p>
-    The crop area can be adjusted by clicking on the inside of the crop area border and dragging the mouse.
-    </p>
+    <p>Um nur einen Teil der eingescannten Seite zu verwenden, können Sie mit dem Zuschneiden-Knopf in der Werkzeugleiste diese auf die gewünschte Größe zuschneiden. Eine Maske wird über der aktuellen Seite angezeigt, wobei der nicht zu verwendende Teil in Grau dargestellt wird.</p>
+    <p>Sie können den Zuschnittbereich anpassen, indem Sie innerhalb der Umrandung dieses Bereichs mit der Maus klicken und die Maus dann ziehen.</p>
     <p>
     Fixed crop sizes can be chosen from the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly used paper sizes.
     </p>
-    <p>
-    Each new page that is scanned will use the previous crop.
-    </p>
+    <p>Jede neu eingescannte Seite verwendet den Zuschnitt der vorherigen Seite.</p>
 </page>
diff --git a/help/de/dpi.page b/help/de/dpi.page
index 4d2ac42..e0f14b1 100644
--- a/help/de/dpi.page
+++ b/help/de/dpi.page
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Setting the Scan Resolution</title>
+	<title>Festlegen der Auflösung</title>
 
     <p>
     By default text documents will be scanned at 200 dots per inch (dpi) and photos at 400 dpi.
diff --git a/help/de/email.page b/help/de/email.page
index ab4e829..a182243 100644
--- a/help/de/email.page
+++ b/help/de/email.page
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="email" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Sending via Email</title>
+	<title>Per E-Mail versenden</title>
 
     <p>
     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.
     </p>
-    <p>
-    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.    
-    </p>
-    <p>
-    See <link xref="save"/> for more information about file formats.
-    </p>
+    <p>Falls der Dokumenttyp auf Text gesetzt ist, dann wird der E-Mail-Anhang im PDF-Format versendet, anderenfalls wird für jede Seite ein separater JPEG-Anhang erzeugt.</p>
+    <p>In <link xref="save"/> finden Sie weitere Informationen über Dateiformate.</p>
 </page>
diff --git a/help/de/index.page b/help/de/index.page
index ee74f28..9ccc1ca 100644
--- a/help/de/index.page
+++ b/help/de/index.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="de">
 
 	<info>
 		<credit type="author">
@@ -9,17 +9,17 @@
 		<include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 	</info>
 
-	<title>Simple Scan Help</title>
+	<title>Hilfe zu Simple Scan</title>
     
     <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
+        <title>Scannen von Seiten</title>
     </section>
 
     <section id="modify" style="2column">
-        <title>Modifying the Document</title>
+        <title>Bearbeiten des Dokuments</title>
     </section>
 
     <section id="use" style="2column">
-        <title>Using the Document</title>
+        <title>Das Dokument verwenden</title>
     </section>
 </page>
diff --git a/help/de/print.page b/help/de/print.page
index aaf6baa..1d93167 100644
--- a/help/de/print.page
+++ b/help/de/print.page
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="print" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Printing</title>
+	<title>Drucken</title>
 
     <p>
     To print the current document use the <guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>P</key></keyseq>).
diff --git a/help/de/reorder.page b/help/de/reorder.page
index b353801..9963860 100644
--- a/help/de/reorder.page
+++ b/help/de/reorder.page
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="reorder" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Reordering Pages</title>
+	<title>Seiten neu anordnen</title>
 
     <p>
     To move a page, select it and move the page left or right using the <key>&lt;</key> and <key>&gt;</key> keys.
diff --git a/help/de/rotate.page b/help/de/rotate.page
index 2891582..6b8a65d 100644
--- a/help/de/rotate.page
+++ b/help/de/rotate.page
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rotate" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Rotating Pages</title>
+	<title>Seiten drehen</title>
 
     <p>
     To rotate a page use the rotation buttons in the toolbar or the <key>[</key> and <key>]</key> keys.
diff --git a/help/de/save.page b/help/de/save.page
index bced8ec..ab8e6a3 100644
--- a/help/de/save.page
+++ b/help/de/save.page
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="save" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Saving to a File</title>
+	<title>Speichern in einer Datei</title>
 
     <p>
     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>).
@@ -14,18 +14,18 @@
     <terms>
       <item>
         <title>Portable Document Format (PDF)</title>
-        <p>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.</p>
-        <p>Use this type if you have scanned multiple pages of text.</p>
+        <p>Ein PDF kann mehrere Seiten enthalten (wie ein Buch) und lässt sich auf einfache Art und Weise an Andere weitergeben. Die meisten Benutzer verfügen nicht über Software zum Bearbeiten von PDF-Dokumenten, so dass sich dieses Format bestens zur Archivierung eignet.</p>
+        <p>Verwenden Sie diesen Typ, wenn Sie mehrere Textseiten eingescannt haben.</p>
       </item>
       <item>
         <title>JPEG</title>
-        <p>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.</p>
-        <p>Use this type if you want to modify or upload the scanned images.</p>
+        <p>JPEG ist das von Digitalkameras verwendete Dateiformat. Es ist recht klein und bestens für die Weitergabe geeignet. Die meisten Benutzer verfügen über Software zum Bearbeiten von JPEG-Fotos, außerdem lässt es sich einfach auf Webseiten sozialer Netzwerke hochladen. Falls Sie mehrere Seiten eingescannt haben, wird für jede Seite eine JPEG-Datei erzeugt.</p>
+        <p>Verwenden Sie diesen Typ, wenn Sie die eingescannten Bilder bearbeiten oder hochladen wollen.</p>
       </item>
       <item>
         <title>PNG</title>
-        <p>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.</p>
-        <p>Use this type if you need high resolution files for editing</p>
+        <p>PNG-Dateien enthalten die Rohdaten aus dem Scanner. Dadurch sind sie wesentlich größer als JPEG-Dateien und für die Weitergabe ungeeignet. Wenn Sie mehrere Seiten einscannen, wird für jede Seite eine PNG-Datei erzeugt.</p>
+        <p>Verwenden Sie diesen Typ, wenn sie hochauflösende Dateien zur Weiterverarbeitung benötigen.</p>
       </item>
     </terms>
 </page>
diff --git a/help/de/scanner.page b/help/de/scanner.page
index 70935c8..dc6764b 100644
--- a/help/de/scanner.page
+++ b/help/de/scanner.page
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanner" xml:lang="de">
 
     <info>
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Selecting a Scanner</title>
+	<title>Einen Scanner auswählen</title>
 
     <p>
     If you have multiple scanners you can change which scanner is selected from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
diff --git a/help/de/scanning.page b/help/de/scanning.page
index 01ab072..601c818 100644
--- a/help/de/scanning.page
+++ b/help/de/scanning.page
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning">
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="de">
 
     <info>
         <title type="sort">0</title>
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Scanning a Page</title>
+	<title>Scannen einer Seite</title>
 
-    <p>
-    To scan a document from your scanner:
-    </p>
+    <p>So scannen Sie ein Dokument mit ihrem Scanner ein:</p>
     <steps>
     <item>
-      <p>
-        Connect the scanner to your computer.
-      </p>
+      <p>Schließen Sie den Scanner an Ihren Rechner an.</p>
     </item>
     <item>
       <p>
@@ -29,9 +25,7 @@
     </item>
     </steps>
 
-    <p>
-    The page will be shown as it is scanned.
-    </p>
+    <p>Jede Seite wird so angezeigt, wie sie gescannt wurde.</p>
 
     <p>
     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>.
diff --git a/help/translations/simple-scan-help.pot b/help/translations/simple-scan-help.pot
deleted file mode 100644
index 10be4e8..0000000
--- a/help/translations/simple-scan-help.pot
+++ /dev/null
@@ -1,228 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-22 10:11+1100\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: scanning.page:6(title)
-msgid "0"
-msgstr ""
-
-#: scanning.page:10(title)
-msgid "Scanning a Page"
-msgstr ""
-
-#: scanning.page:12(p)
-msgid "To scan a document from your scanner:"
-msgstr ""
-
-#: scanning.page:17(p)
-msgid "Connect the scanner to your computer."
-msgstr ""
-
-#: scanning.page:22(p)
-msgid "Open <app>Simple Scan</app>."
-msgstr ""
-
-#: scanning.page:27(p)
-msgid "Press the scan button in the toolbar (or <keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-msgstr ""
-
-#: scanning.page:33(p)
-msgid "The page will be shown as it is scanned."
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: scanning.page:47(p)
-msgid "To stop the scan at any time press <key>Escape</key>."
-msgstr ""
-
-#: scanner.page:9(title)
-msgid "Selecting a Scanner"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: save.page:9(title)
-msgid "Saving to a File"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: save.page:17(title)
-msgid "Portable Document Format (PDF)"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: save.page:19(p)
-msgid "Use this type if you have scanned multiple pages of text."
-msgstr ""
-
-#: save.page:22(title)
-msgid "JPEG"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: save.page:24(p)
-msgid "Use this type if you want to modify or upload the scanned images."
-msgstr ""
-
-#: save.page:27(title)
-msgid "PNG"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: save.page:29(p)
-msgid "Use this type if you need high resolution files for editing"
-msgstr ""
-
-#: rotate.page:9(title)
-msgid "Rotating Pages"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: reorder.page:9(title)
-msgid "Reordering Pages"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: reorder.page:14(p)
-msgid "To remove the selected page use the <key>Delete</key> key."
-msgstr ""
-
-#: print.page:9(title)
-msgid "Printing"
-msgstr ""
-
-#: 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>)."
-msgstr ""
-
-#: email.page:9(title)
-msgid "Sending via Email"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: email.page:18(p)
-msgid "See <link xref=\"save\"/> for more information about file formats."
-msgstr ""
-
-#: dpi.page:9(title)
-msgid "Setting the Scan Resolution"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: crop.page:9(title)
-msgid "Cropping"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: crop.page:21(p)
-msgid "Each new page that is scanned will use the previous crop."
-msgstr ""
-
-#: adf.page:9(title)
-msgid "Using an Automatic Document Feeder"
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#: index.page:7(name)
-msgid "Robert Ancell"
-msgstr ""
-
-#: index.page:8(email)
-msgid "robert.ancell@gmail.com"
-msgstr ""
-
-#: index.page:13(title)
-msgid "Simple Scan Help"
-msgstr ""
-
-#: index.page:16(title)
-msgid "Scanning Pages"
-msgstr ""
-
-#: index.page:20(title)
-msgid "Modifying the Document"
-msgstr ""
-
-#: index.page:24(title)
-msgid "Using the Document"
-msgstr ""
-
-#: 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>."
-msgstr ""
-
-#: 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."
-msgstr ""
-
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: legal.xml:0(None)
-msgid "translator-credits"
-msgstr ""
-