Merge branch 'master' of https://github.com/Gnucash/gnucash-docs

Conflicts:
	configure.ac

guide/C/ch_oview.xml

@@ -268,7 +268,7 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>General Ledger</emphasis>: One register window can
+          <para><emphasis>General Journal</emphasis>: One register window can
           display multiple accounts at the same time. This eases the trouble
           of tracking down typing/entry errors. It also provides a convenient
           way of viewing a portfolio of many stocks, by showing all

guide/C/ch_txns.xml

@@ -216,12 +216,13 @@
     <tip><para>Specifically for dates there's another way you can save time: you can enter
             partial dates. For example if you only enter one number, <application>&app;</application>
             will interpret it as the day in the current month of the current year. If you only enter
-            a day and month, <application>&app;</application> will automatically append the year. By
-            default this is the current year. You can however also configure
-            <application>&app;</application> to take such a date in a sliding window starting
-            a number of months before the current month. This can be done via
+            a day and month, <application>&app;</application> will automatically append the year. The
+            default this to take such a date in a sliding window starting 11 months before the current
+            month. This means that if you enter 1/5 (January 5th) as date while the current date is
+            in December 2015, the date will be completed as 1/5/16. This default can be changed via
             <menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Date/Time</guisubmenu>
-            <guilabel>Date Completion</guilabel></menuchoice>.</para></tip>
+            <guilabel>Date Completion</guilabel></menuchoice>. You can change it to either always
+            evaluate a date in the current calendar year or change the start of the sliding window.</para></tip>
 
     <para>In the <guilabel>Num</guilabel> field of the transaction line, you
         can type <keycap>+</keycap> to increment the transaction number from the

guide/de/toc.xml

@@ -68,7 +68,7 @@
 <listitem><para>4.3 Eine Buchung eingeben (How-To)</para></listitem>
 <listitem><para>        4.3.1 Register</para></listitem>
 <listitem><para>        4.3.2 Transfer Dialog</para></listitem>
-<listitem><para>        4.3.3 General Ledger Tool</para></listitem>
+<listitem><para>        4.3.3 General Journal Tool</para></listitem>
 <listitem><para>4.4 Entering Multiple Splits (How-To)</para></listitem>
 <listitem><para>4.5 Using Entry Shortcuts (How-To)</para></listitem>
 <listitem><para>        4.5.1 Autofill</para></listitem>

guide/it/gnucash-guide.xml

@@ -2432,12 +2432,13 @@ Translators:
     <tip><para>Specifically for dates there's another way you can save time: you can enter
             partial dates. For example if you only enter one number, <application>GnuCash</application>
             will interpret it as the day in the current month of the current year. If you only enter
-            a day and month, <application>GnuCash</application> will automatically append the year. By
-            default this is the current year. You can however also configure
-            <application>GnuCash</application> to take such a date in a sliding window starting
-            a number of months before the current month. This can be done via
+            a day and month, <application>GnuCash</application> will automatically append the year. The
+            default this to take such a date in a sliding window starting 11 months before the current
+            month. This means that if you enter 1/5 (January 5th) as date while the current date is
+            in December 2015, the date will be completed as 1/5/16. This default can be changed via
             <menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Date/Time</guisubmenu>
-            <guilabel>Date Completion</guilabel></menuchoice>.</para></tip>
+            <guilabel>Date Completion</guilabel></menuchoice>. You can change it to either always
+            evaluate a date in the current calendar year or change the start of the sliding window.</para></tip>
 
     <para>Nel campo <guilabel>Nr.</guilabel> nella linea di una transazione, è possibile premere <keycap>+</keycap> per incrementare il numero della transazione, mentre premendo <keycap>-</keycap> verrà diminuito il numero. Questo funzionerà anche nel campo <guilabel>Operazione</guilabel> nella linea della suddivisione, se si sceglie di immettere i numeri della suddivisione qui. Il campo <guilabel>Operazione</guilabel> supporta anche <emphasis>Quickfill</emphasis>: se si digitano i primi caratteri di una operazione comune (come <emphasis>Deposito</emphasis>), <application>&app;</application> completerà il resto.</para>
 

guide/it/it.po

@@ -2396,7 +2396,7 @@ msgstr ""
 
 #: C/gnucash-guide.xml:286(para)
 msgid ""
-"<emphasis>General Ledger</emphasis>: One register window can display "
+"<emphasis>General Journal</emphasis>: One register window can display "
 "multiple accounts at the same time. This eases the trouble of tracking down "
 "typing/entry errors. It also provides a convenient way of viewing a "
 "portfolio of many stocks, by showing all transactions in that portfolio."

help/C/Help_ch_GUIMenus.xml

@@ -3193,7 +3193,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/txns-register
 
               <entry><para>Show all splits in the current transaction.  Not highlighted if
                <menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split
-               Ledger</guimenuitem></menuchoice> is enableb.</para></entry>
+               Ledger</guimenuitem></menuchoice> is enabled.</para></entry>
             </row>
 
             <row>

help/C/Help_ch_Reports.xml

@@ -453,6 +453,25 @@
                  <listitem><para><guilabel>Account Name</guilabel></para></listitem>
                  <listitem><para><guilabel>Use Full Account Name</guilabel></para></listitem>
                  <listitem><para><guilabel>Account Code</guilabel></para></listitem>
+                 <listitem><para><guilabel>Detail Level</guilabel>&mdash; One of</para>
+                   <informaltable>
+                     <tgroup cols="2">
+                       <tbody>
+                         <row><entry>Single</entry><entry>Display 1 line</entry></row>
+                         <row><entry>Multi-Line</entry><entry>Display N lines</entry></row>
+                       </tbody>
+                     </tgroup>
+                   </informaltable>
+                   <note>
+                     <para>Before  stable version 2.8.0
+                     <emphasis>Detail Level</emphasis> was called <emphasis>Style</emphasis> on the General tab.</para>
+                   </note>
+
+                   <para>If <emphasis>Detail Level</emphasis> is <emphasis>Multi-Line</emphasis>,
+                     check boxes <emphasis>Other Account Name</emphasis> and <emphasis>Use Full Other Account Name</emphasis>
+                     are automatically deselected and disabled, and the <emphasis>Transfer</emphasis> column is not reported.
+                   </para>
+                 </listitem>
 
                  <listitem><para><guilabel>Other Account Name:</guilabel> For multi-split transactions, this parameter should be unticked. See below for more details.</para>
                  </listitem>
@@ -624,9 +643,9 @@
 
         <sect4 id="report-txrpt-splits">
           <title>Displaying Split Account Details</title>
-          <para>This is controled by the <emphasis>Style</emphasis> option on the General tab.</para>
+          <para>This is controled by the <emphasis>Detail Level</emphasis> option on the Display tab.</para>
           <note>
-           <para>In stable version 2.8.0 this option will be renamed to <emphasis>Detail Level</emphasis> on the Display tab.</para>
+           <para>In stable versions before 2.8.0 this option was called <emphasis>Style</emphasis> on the General tab.</para>
           </note>
           <para>In <emphasis>Single</emphasis> line mode, there's only one line per transaction. So you can have
             the account name on one side of the equation and

help/it/gnucash-help.xml

@@ -2670,7 +2670,7 @@
               <row>
                 <entry><para><guimenuitem>Giornale generale</guimenuitem></para></entry>
 
-                <entry><para>See <xref linkend="general-journal"/></para></entry>
+                <entry><para>Vedere la <xref linkend="general-journal"/></para></entry>
               </row>
             </tbody>
           </tgroup>
@@ -2884,10 +2884,10 @@
 </sect1>
 
 <sect1>
-   <title>Account Register/General Journal</title>
+   <title>Registro del conto/Libro mastro generale</title>
 
     <sect2 id="account-register">
-      <title>Account Register &amp; General Journal Window</title>
+      <title>Registro del conto e finestra del libro mastro generale</title>
 
       <para>Questa finestra è utilizzata per l&rsquo;inserimento e la modifica dei dati del conto; fornisce anche degli strumenti per la pianificazione futura delle transazioni, per cercare e per creare dei resoconti sulle transazioni e per la stampa degli assegni.</para>
 
@@ -4014,7 +4014,9 @@
             <row>
               <entry><para><guibutton>Suddivisione</guibutton></para></entry>
 
-              <entry><para>Mostra tutte le suddivisioni nella transazione selezionata. Questo pulsante è disattivato se è stato scelta l&rsquo;opzione <menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Mastro a espansione automatica</guimenuitem></menuchoice></para></entry>
+              <entry><para>Show all splits in the current transaction.  Not highlighted if
+               <menuchoice><guimenu>View</guimenu><guimenuitem>Auto-Split
+               Ledger</guimenuitem></menuchoice> is enabled.</para></entry>
             </row>
 
             <row>
@@ -7564,12 +7566,9 @@ Translators:
 
   <sect1 id="general-journal">
     <title>Giornale generale</title>
-    <para>The General Journal is an advanced register used to enter transactions without needing to open
-    individual accounts. The General Journal shows the transaction entries for all accounts on one register.</para>
+    <para>Il libro mastro generale è un registro avanzato che permette di inserire le transazioni senza il bisogno di aprire i singoli conti; permette anche di visualizzare tutte le transazioni per tutti i conti in un unico registro.</para>
 
-    <para>Entering transactions in the General Journal is more complicated than entering them in the individual
-    account registers. The advantage is the General Journal provides a more comprehensive view of the
-    transactions you have entered in all your accounts.</para>
+    <para>L&rsquo;inserimento di una transazione nel libro mastro generale è più complicato rispetto alla stessa operazione compiuta dal registro del conto. Il vantaggio del libro mastro generale risiede nella visualizzazione più esaustiva delle transazioni inserite in tutti i propri conti.</para>
 
     <para>The General Journal defaults to showing only the previous month of transactions. This is changeable
     by using the "Filter By..." on the View menu.</para>
@@ -13531,6 +13530,25 @@ ________________________________________________________________________________
                  <listitem><para><guilabel>Account Name</guilabel></para></listitem>
                  <listitem><para><guilabel>Use Full Account Name</guilabel></para></listitem>
                  <listitem><para><guilabel>Account Code</guilabel></para></listitem>
+                 <listitem><para><guilabel>Detail Level</guilabel>— One of</para>
+                   <informaltable>
+                     <tgroup cols="2">
+                       <tbody>
+                         <row><entry>Single</entry><entry>Display 1 line</entry></row>
+                         <row><entry>Multi-Line</entry><entry>Display N lines</entry></row>
+                       </tbody>
+                     </tgroup>
+                   </informaltable>
+                   <note>
+                     <para>Before  stable version 2.8.0
+                     <emphasis>Detail Level</emphasis> was called <emphasis>Style</emphasis> on the General tab.</para>
+                   </note>
+
+                   <para>If <emphasis>Detail Level</emphasis> is <emphasis>Multi-Line</emphasis>,
+                     check boxes <emphasis>Other Account Name</emphasis> and <emphasis>Use Full Other Account Name</emphasis>
+                     are automatically deselected and disabled, and the <emphasis>Transfer</emphasis> column is not reported.
+                   </para>
+                 </listitem>
 
                  <listitem><para><guilabel>Other Account Name:</guilabel> For multi-split transactions, this parameter should be unticked. See below for more details.</para>
                  </listitem>
@@ -13702,9 +13720,9 @@ ________________________________________________________________________________
 
         <sect4 id="report-txrpt-splits">
           <title>Displaying Split Account Details</title>
-          <para>This is controled by the <emphasis>Style</emphasis> option on the General tab.</para>
+          <para>This is controled by the <emphasis>Detail Level</emphasis> option on the Display tab.</para>
           <note>
-           <para>In stable version 2.8.0 this option will be renamed to <emphasis>Detail Level</emphasis> on the Display tab.</para>
+           <para>In stable versions before 2.8.0 this option was called <emphasis>Style</emphasis> on the General tab.</para>
           </note>
           <para>In <emphasis>Single</emphasis> line mode, there's only one line per transaction. So you can have
             the account name on one side of the equation and

help/it/it.po

@@ -2500,8 +2500,8 @@ msgid "Open a screen where you can enter the required information to close the c
 msgstr "Apre una schermata in cui è possibile inserire le informazioni necessarie alla chiusura del libro contabile corrente."
 
 #: C/gnucash-help.xml:1552(para)
-msgid "See <xref linkend=\"general-ledger\"/>"
-msgstr "Vedere la <xref linkend=\"general-ledger\"/>"
+msgid "See <xref linkend=\"general-journal\"/>"
+msgstr "Vedere la <xref linkend=\"general-journal\"/>"
 
 #: C/gnucash-help.xml:1560(title)
 #: C/gnucash-help.xml:1563(title)
@@ -2690,11 +2690,11 @@ msgid "The <firstterm>Statusbar</firstterm> displays informations about the curr
 msgstr "La <firstterm>barra di stato</firstterm> visualizza dei suggerimenti che forniscono maggiori dettagli sulla voce del menu selezionata e mostra anche una barra di avanzamento quando si sta aprendo o salvando un file o generando un resoconto. La <emphasis>barra di stato</emphasis> può essere nascosta o resa visibile selezionando la voce <guimenuitem>Barra di stato</guimenuitem> presente nel menu <guimenu>Visualizza</guimenu>."
 
 #: C/gnucash-help.xml:1797(title)
-msgid "Account Register/General Ledger"
+msgid "Account Register/General Journal"
 msgstr "Registro del conto/Libro mastro generale"
 
 #: C/gnucash-help.xml:1800(title)
-msgid "Account Register &amp; General Ledger Window"
+msgid "Account Register &amp; General Journal Window"
 msgstr "Registro del conto e finestra del libro mastro generale"
 
 #: C/gnucash-help.xml:1802(para)
@@ -5212,15 +5212,15 @@ msgid "Direct Debit"
 msgstr "Addebito diretto"
 
 #: C/gnucash-help.xml:730(para)
-msgid "The General Ledger is an advanced register used to enter transactions without needing to open individual accounts. The General Ledger shows the transaction entries for all accounts on one register."
+msgid "The General Journal is an advanced register used to enter transactions without needing to open individual accounts. The General Journal shows the transaction entries for all accounts on one register."
 msgstr "Il libro mastro generale è un registro avanzato che permette di inserire le transazioni senza il bisogno di aprire i singoli conti; permette anche di visualizzare tutte le transazioni per tutti i conti in un unico registro."
 
 #: C/gnucash-help.xml:733(para)
-msgid "Entering transactions in the General Ledger is more complicated than entering them in the individual account registers. The advantage is the General Ledger provides a more comprehensive view of the transactions you have entered in all your accounts."
+msgid "Entering transactions in the General Journal is more complicated than entering them in the individual account registers. The advantage is the General Journal provides a more comprehensive view of the transactions you have entered in all your accounts."
 msgstr "L&rsquo;inserimento di una transazione nel libro mastro generale è più complicato rispetto alla stessa operazione compiuta dal registro del conto. Il vantaggio del libro mastro generale risiede nella visualizzazione più esaustiva delle transazioni inserite in tutti i propri conti."
 
 #: C/gnucash-help.xml:737(para)
-msgid "The General Ledger defaults to showing only the previous month of transactions. This is changeable by using the Date Range on the View menu."
+msgid "The General Journal defaults to showing only the previous month of transactions. This is changeable by using the Date Range on the View menu."
 msgstr "Il libro mastro generale è impostato di default per visualizzare solamente le transazioni dell&rsquo;ultimo mese. Questa impostazione può essere cambiata utilizzando la voce «Intervallo temporale» nel menu «Visualizza»."
 
 #: C/gnucash-help.xml:19(title)
@@ -13119,7 +13119,7 @@ msgstr "Cristian Marchi, 2011"
 #~ "per quel conto. (scorciatoia Alt-F,A,C)"
 
 #~ msgid ""
-#~ "When an account is selected in the Account Tree opens a General Ledger "
+#~ "When an account is selected in the Account Tree opens a General Journal "
 #~ "register for that account and all sub-accounts. (Shortcut Alt-F,O,A)"
 #~ msgstr ""
 #~ "Quando è selezionato un conto nella struttura dei conti, viene aperto un "