Merge tag 'upstream/3.19.1'

Upstream version 3.19.1

8 files changed, 80 insertions, 8 deletions

diff --git a/help/C/brightness-contrast.page b/help/C/brightness-contrast.page
new file mode 100644
index 0000000..7f0c743
--- /dev/null
+++ b/help/C/brightness-contrast.page
@@ -0,0 +1,15 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="brightness-contrast">
+
+    <info>
+        <link type="guide" xref="index#acquire"/>
+    </info>
+
+	<title>Setting brightness and Contrast</title>
+
+    <p>
+    Some scanners allow the user to adjust the brightness and contrast when scanning.
+    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    </p>
+</page>
diff --git a/help/C/quality.page b/help/C/quality.page
new file mode 100644
index 0000000..1075783
--- /dev/null
+++ b/help/C/quality.page
@@ -0,0 +1,17 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="quality">
+
+    <info>
+        <link type="guide" xref="index#use"/>
+    </info>
+
+	<title>Setting the Image Quality</title>
+
+    <p>
+    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
+    A high quality will keep all the scanned information but require a larger file size.
+    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
+    </p>    
+</page>
diff --git a/help/C/save.page b/help/C/save.page
index 575c36a..8b0b9d0 100644
--- a/help/C/save.page
+++ b/help/C/save.page
@@ -35,7 +35,8 @@
 		<td><p>PDF</p></td>
 		<td><p>A PDF can contain multiple pages, like a book, and is easy to distribute. Only a small number
 		of linux programs can modify PDF documents, so this format is recommended primarily for archiving.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wiki page</link> for more information.
+        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
+		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia page</link> for more information.
 		    </p></td>
 	</tr>
 	<tr>
@@ -44,14 +45,15 @@
 		small, very easy to distribute, and suitable for uploading to social networking sites. Most operating
 		systems come with a JPEG editor by default. If you have scanned multiple pages, a JPEG file will be
 		created for each page. Use this file type if you want to modify or upload the scanned images.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wiki page</link> for more information.
+        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
+		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia page</link> for more information.
 		    </p></td>
 	</tr>
 	<tr>
 		<td><p>PNG</p></td>
 		<td><p>PNG files contain the raw data from the scanner. This makes them very large and not suitable
 		for distributing. If you have scanned multiple pages, a PNG file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wiki page</link>
+		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
@@ -59,7 +61,7 @@
 		<td><p>TIFF</p></td>
 		<td><p>TIFF files contain the raw data from the scanner. This makes them very large and not suitable
 		for distributing. If you have scanned multipe pages, a TIFF file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wiki page</link>
+		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
diff --git a/help/Makefile.am b/help/Makefile.am
index 63f36be..334c7d1 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -10,11 +10,13 @@ HELP_MEDIA = \
 
 HELP_FILES = index.page \
              adf.page \
+             brightness-contrast.page \
              crop.page \
              dpi.page \
              email.page \
              legal.xml \
              print.page \
+             quality.page \
              reorder.page \
              rotate.page \
              save.page \
diff --git a/help/Makefile.in b/help/Makefile.in
index 3f251d5..88af88b 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -175,6 +175,8 @@ MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGEKIT_CFLAGS = @PACKAGEKIT_CFLAGS@
+PACKAGEKIT_LIBS = @PACKAGEKIT_LIBS@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
@@ -251,11 +253,13 @@ HELP_MEDIA = \
 
 HELP_FILES = index.page \
              adf.page \
+             brightness-contrast.page \
              crop.page \
              dpi.page \
              email.page \
              legal.xml \
              print.page \
+             quality.page \
              reorder.page \
              rotate.page \
              save.page \
diff --git a/help/de/brightness-contrast.page b/help/de/brightness-contrast.page
new file mode 100644
index 0000000..170e7ee
--- /dev/null
+++ b/help/de/brightness-contrast.page
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="brightness-contrast" xml:lang="de">
+
+    <info>
+        <link type="guide" xref="index#acquire"/>
+    </info>
+
+	<title>Setting brightness and Contrast</title>
+
+    <p>
+    Some scanners allow the user to adjust the brightness and contrast when scanning.
+    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    </p>
+</page>
diff --git a/help/de/quality.page b/help/de/quality.page
new file mode 100644
index 0000000..8c916e3
--- /dev/null
+++ b/help/de/quality.page
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="quality" xml:lang="de">
+
+    <info>
+        <link type="guide" xref="index#use"/>
+    </info>
+
+	<title>Setting the Image Quality</title>
+
+    <p>
+    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
+    A high quality will keep all the scanned information but require a larger file size.
+    See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
+    </p>    
+</page>
diff --git a/help/de/save.page b/help/de/save.page
index c59a243..6ce7c83 100644
--- a/help/de/save.page
+++ b/help/de/save.page
@@ -34,7 +34,8 @@
 		<td><p>PDF</p></td>
 		<td><p>A PDF can contain multiple pages, like a book, and is easy to distribute. Only a small number
 		of linux programs can modify PDF documents, so this format is recommended primarily for archiving.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wiki page</link> for more information.
+        The size of the PDF document is affected by the <link xref="quality">image quality</link>.
+		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia page</link> for more information.
 		    </p></td>
 	</tr>
 	<tr>
@@ -43,14 +44,15 @@
 		small, very easy to distribute, and suitable for uploading to social networking sites. Most operating
 		systems come with a JPEG editor by default. If you have scanned multiple pages, a JPEG file will be
 		created for each page. Use this file type if you want to modify or upload the scanned images.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wiki page</link> for more information.
+        The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
+		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia page</link> for more information.
 		    </p></td>
 	</tr>
 	<tr>
 		<td><p>PNG</p></td>
 		<td><p>PNG files contain the raw data from the scanner. This makes them very large and not suitable
 		for distributing. If you have scanned multiple pages, a PNG file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wiki page</link>
+		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
@@ -58,7 +60,7 @@
 		<td><p>TIFF</p></td>
 		<td><p>TIFF files contain the raw data from the scanner. This makes them very large and not suitable
 		for distributing. If you have scanned multipe pages, a TIFF file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wiki page</link>
+		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>