Merge branch 'maint'

Author: fellen

guide/C/ch_import_business_data.xml

@@ -49,8 +49,8 @@ Updated:
 			<title>The format of the import file</title>
 
 			<para>
-				The import file should contain rows of invoice entry data, each row marked by an invoice ID. The file should be
-				sorted on invoice ID. Each row contains header and entry fields, but <application>&app;</application> takes the
+				The import file should contain rows of invoice entry data.
+				Any row contains both header and entry fields, but <application>&app;</application> takes the
 				invoice header data from the first row of an invoice ID. For informational purposes, 
 				the header data may be repeated for each subsequent row of the same invoice.
 			</para>
@@ -67,7 +67,8 @@ Updated:
 			<itemizedlist>
 				<listitem>
 					<para><emphasis><prompt>id</prompt></emphasis> -
-						The invoice ID. Mandatory. Any row without an invoice ID will be ignored. If the invoice ID already exists,
+						The invoice ID. If the invoice ID is blank, <application>&app;</application> replaces it with the
+						invoice ID from the previous row. If the invoice ID already exists,
 						<application>&app;</application> will add the entries to the existing invoice (unless it is already posted).
 					</para>
 				</listitem>
@@ -226,7 +227,7 @@ Updated:
 
 	 	 	<para>
 				Example content for one customer invoice, with one entry, including tax and discount.
-				Using comma fields separator, decimal point and dd/mm/yyyy date format. 
+				Using comma field separator, decimal point and dd/mm/yyyy date format. 
 				The the value of the description field contains the separator character.
 			</para>
 
@@ -435,7 +436,9 @@ Updated:
 				<itemizedlist>
 					<listitem>
 						<para>
-							The field <prompt>ID</prompt> is blank. Every row should have an invoice ID.
+							The field <prompt>ID</prompt> is blank. <application>&app;</application>  replaces a blank invoice ID
+							with the invoice ID from the previous row. But the first row of the import file should always have
+							an invoice ID.
 						</para>
 					</listitem>
 					<listitem>

guide/C/gnucash-guide.xml

@@ -438,26 +438,25 @@
     <author>
       <firstname>Bengt</firstname> <surname>Thuree</surname>
     </author>.
-
-<!-- This is appropriate place for other contributors: translators,
-      maintainers,  etc. Commented out by default.
-      Note: Do not use the addess tag, if you do not want to be contacted
-            with user questions over decades. -->
+  </para>
+<!-- This is the appropriate place for other contributors: translators,
+  maintainers,  etc. Commented out by default.
+  Note: Do not use the addess tag, if you do not want to be contacted
+        with user questions over decades. -->
 <!-- 
+  <para>This - still incomplete - translation was created by the
+    Latin &appname; translation team, which included until now
+    <othercredit role="translator">
+      <firstname>Latin</firstname>
+      <surname>Translator 1</surname>
+      <affiliation>
+        <orgname>Latin &appname; Translation Team</orgname>
+        <address> <email>translator@gnome.org</email> </address>
+      </affiliation>
+      <contrib>Latin translation</contrib>
+    </othercredit>.
   </para>
-  <para> This translation was provided by
-        <author role="translator">
-        <firstname>Latin</firstname>
-        <surname>Translator 1</surname>
-        <affiliation>
-          <orgname>Latin Translation Team</orgname>
-          <address> <email>translator@gnome.org</email> </address>
-        </affiliation>
-        <contrib>Latin translation</contrib>
-        <email>email@address.com</email>
-      </author>.
 -->
-  </para>
 </preface>
 
 <part>

guide/de/gnucash-guide.xml

@@ -375,13 +375,12 @@
 </bookinfo>
 <preface>
   <title>Über die Verfasser</title>
-  <para>
- 	Das Dokumentationsteam von &app; ist eine selbsternannte Gruppe von &app;-Nutzern 
-  und -Entwicklern, die sich angeboten haben, diese Dokumentation zu schreiben, 
-  zum Wohle der breiten Nutzerschaft. Menschen, die daran intressiert sind,
-  dieser Gruppe bezutreten, werden ermutigt, ihr Interesse auf einer der &app;
-  Mailinglisten <email>gnucash-devel@gnucash.org</email> (englische Dokumentation) oder <email>gnucash-de@gnucash.org</email> (Übersetzung) 
-  für weitere Anleitungen kundzutun.
+  <para>Das Dokumentationsteam von &app; ist eine selbsternannte Gruppe von &app;-Nutzern 
+    und -Entwicklern, die sich angeboten haben, diese Dokumentation zu schreiben, 
+    zum Wohle der breiten Nutzerschaft. Menschen, die daran intressiert sind,
+    dieser Gruppe bezutreten, werden ermutigt, ihr Interesse auf einer der &app;
+    Mailinglisten <email>gnucash-devel@gnucash.org</email> (englische Dokumentation) oder <email>gnucash-de@gnucash.org</email> (Übersetzung) 
+    für weitere Anleitungen kundzutun.
   </para>
 
   <para>Beitragende im Team sind bisher:
@@ -436,14 +435,13 @@
     <author>
       <firstname>Bengt</firstname> <surname>Thuree</surname>
     </author>.
-
-<!-- This is appropriate place for other contributors: translators,
+  </para>
+<!-- This is the appropriate place for other contributors: translators,
       maintainers,  etc. Commented out by default.
       Note: Do not use the addess tag, if you do not want to be contacted
             with user questions over decades. -->
-  </para>
-  <para> Diese (immer noch unvollständge) Übersetzung wurde vom
-      Deutschen &app;-Übersetzungsteam erstellt. Dazu gehören bisher
+  <para>Diese (immer noch unvollständige) Übersetzung wurde vom
+    Deutschen &app;-Übersetzungsteam erstellt. Dazu gehören bisher
 <!--    <author role="translator">
         <firstname>Latin</firstname>
         <surname>Translator 1</surname>