Merge tag 'upstream/3.19.4'

Upstream version 3.19.4

7 files changed, 16 insertions, 12 deletions

diff --git a/help/de/adf.page b/help/de/adf.page
index 5a23e9f..8f0ac93 100644
--- a/help/de/adf.page
+++ b/help/de/adf.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Verwendung eines automatischen Dokumenteneinzugs</title>
+	<title>Benutzung eines automatischen Dokumenteneinzuges</title>
 
     <p>
     If your scanner features an Automatic Document Feeder (ADF) 
diff --git a/help/de/de.po b/help/de/de.po
index 661ba5b..1c5ee51 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
-"X-Generator: Launchpad (build 17812)\n"
+"X-Launchpad-Export-Date: 2015-12-22 04:39+0000\n"
+"X-Generator: Launchpad (build 17865)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
diff --git a/help/de/dpi.page b/help/de/dpi.page
index 8cc87d9..04f8a2c 100644
--- a/help/de/dpi.page
+++ b/help/de/dpi.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Festlegen der Auflösung</title>
+	<title>Setting the Scan Resolution</title>
 
     <p>
     The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
diff --git a/help/de/email.page b/help/de/email.page
index 94ce67d..81a5ca7 100644
--- a/help/de/email.page
+++ b/help/de/email.page
@@ -17,5 +17,7 @@
     Conversely, if the document type was set to "Photo", the email will have a JPEG
     attachment for each page.    
     </p>
-    <p>In <link xref="save"/> finden Sie weitere Informationen über Dateiformate.</p>
+    <p>
+    See <link xref="save"/> for more information about file formats.
+    </p>
 </page>
diff --git a/help/de/index.page b/help/de/index.page
index 41137a8..aca946d 100644
--- a/help/de/index.page
+++ b/help/de/index.page
@@ -16,15 +16,15 @@
 	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
     
     <section id="acquire" style="2column">
-        <title>Scannen von Seiten</title>
+        <title>Seiten scannen</title>
     </section>
 
     <section id="modify" style="2column">
-        <title>Bearbeiten des Dokuments</title>
+        <title>Dokument anpassen</title>
     </section>
 
     <section id="use" style="2column">
-        <title>Das Dokument verwenden</title>
+        <title>Dokument verwenden</title>
     </section>
 
     <section id="shortcuts" style="2column">
diff --git a/help/de/scanner.page b/help/de/scanner.page
index 9d51b25..48667fc 100644
--- a/help/de/scanner.page
+++ b/help/de/scanner.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Einen Scanner auswählen</title>
+	<title>Einen Scanner wählen</title>
 
     <p>
     If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
diff --git a/help/de/scanning.page b/help/de/scanning.page
index 5a2caf0..281e810 100644
--- a/help/de/scanning.page
+++ b/help/de/scanning.page
@@ -6,12 +6,14 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Scannen einer Seite</title>
+	<title>Eine Seite scannen</title>
 
-    <p>So scannen Sie ein Dokument mit ihrem Scanner ein:</p>
+    <p>
+    To scan a document from your scanner:
+    </p>
     <steps>
       <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Open <app>Simple Scan</app>.</p></item>
+      <item><p>Öffnen Sie <app>Simple Scan</app>.</p></item>
       <item><p>Click the arrow to the right of the "Scan" button and choose the type
 	     of document you are scanning: <em>Photo</em> or <em>Text</em>.</p>
 	     <media type="image" src="figures/scan_toolbar.png"/></item>