Merge tag 'upstream/3.24.0'

Upstream version 3.24.0

1 files changed, 56 insertions, 0 deletions

diff --git a/help/ia/dpi.page b/help/ia/dpi.page
new file mode 100644
index 0000000..c233717
--- /dev/null
+++ b/help/ia/dpi.page
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="dpi" xml:lang="ia">
+
+    <info>
+        <link type="guide" xref="index#acquire"/>
+    </info>
+  
+	<title>Setting the Scan Resolution</title>
+
+    <p>
+    The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
+    and for document type <gui><em>Photo</em></gui> is 300 dpi. You can change these settings
+    from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    </p>
+    <media type="image" src="figures/preferences.png"/>
+    
+    <p>The available scanning resolutions for both document types (Text and Photo) are the same
+    and are listed in the following table:</p>
+    
+    <table frame="bottom left right" rules="rows cols" shade="rows">
+	<tr>
+		<td><p><em>Text Resolution</em></p></td>
+		<td><p><em>Photo Resolution</em></p></td>
+	</tr>
+	<tr>
+		<td><p>75 dpi (draft)</p></td>
+		<td><p>75 dpi (draft)</p></td>
+	</tr>
+	<tr>
+		<td><p>150 dpi (default)</p></td>
+		<td><p>150 dpi</p></td>
+	</tr>
+	<tr>
+		<td><p>300 dpi</p></td>
+		<td><p>300 dpi (tacite)</p></td>
+	</tr>
+	<tr>
+		<td><p>600 dpi</p></td>
+		<td><p>600 dpi</p></td>
+	</tr>
+	<tr>
+		<td><p>1200 dpi (alte resolution)</p></td>
+		<td><p>1200 dpi (alte resolution)</p></td>
+	</tr>
+	<tr>
+		<td><p>2400 dpi</p></td>
+		<td><p>2400 dpi</p></td>
+	</tr>
+    </table>
+    
+    <note style="important"><p><gui><em>Text</em></gui> documents are always scanned in black
+      and white, while <gui><em>Photo</em></gui> documents are always scanned in color, at any
+      resolution!</p>
+    </note>
+
+</page>