gnucash-docs maint: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Thu Jan 30 17:33:25 EST 2020
Updated via https://github.com/Gnucash/gnucash-docs/commit/eb1b7296 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/c1ca7dc7 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/e465a181 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d835a6a7 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/bba80c0c (commit)
via https://github.com/Gnucash/gnucash-docs/commit/5ee9d080 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/a162fec6 (commit)
from https://github.com/Gnucash/gnucash-docs/commit/4dc29733 (commit)
commit eb1b7296fc67fd16f097e5a7cf51ec673277c25a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Jan 30 23:24:51 2020 +0100
L12N:it: Remove redundant leading words in the admonition blocks
Only gnucash-guide.xml got patched, not it.po.
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index c8f1237..6e9fe63 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -2492,7 +2492,7 @@ Translators:
<para>Per le transazioni suddivise, la prima linea rappresenta la <emphasis>linea della transazione</emphasis>; essa contiene una <guilabel>Data</guilabel>, un <guilabel>Nr.</guilabel> opzionale (ad esempio il numero dell’assegno), la <guilabel>Descrizione</guilabel> della transazione, l’importo totale che interessa il conto selezionato (<guilabel>Deposito Tot</guilabel> in questo caso) e il <guilabel>Saldo</guilabel> aggiornato dopo la transazione corrente. Si noti che nella vista espansa, l’intestazione della colonna <guilabel>Trasferimento</guilabel> scompare, e non viene visualizzato nessun nome di conto in questo campo. Questa riga mostra solamente un sommario degli effetti della transazione sul conto selezionato. Per avere informazioni più dettagliate, occorre visualizzare le suddivisioni che compongono la transazione.</para>
<note>
- <para>Note: An account register displays a transaction when that
+ <para>An account register displays a transaction when that
transaction has a split assigned to the account. If a given transaction
has more than one split assigned to a single account, then in Basic and
Auto-Split view modes that transaction will appear in the register one
@@ -4465,7 +4465,7 @@ Interesse continuo: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
</literallayout>
<note>
- <para>NOTA: nelle equazioni seguenti per le transazioni finanziarie, tutti i tassi di interesse indicati sono effettivi cioè <quote>ieff</quote>. Per maggiore brevità si utilizzerà comunque il simbolo <quote>i</quote> come abbreviazione di <quote>ieff</quote>.</para>
+ <para>Nelle equazioni seguenti per le transazioni finanziarie, tutti i tassi di interesse indicati sono effettivi cioè <quote>ieff</quote>. Per maggiore brevità si utilizzerà comunque il simbolo <quote>i</quote> come abbreviazione di <quote>ieff</quote>.</para>
</note>
</sect3>
@@ -8471,9 +8471,11 @@ particular date. By default, this report shows accounts and totals
down to third-level subaccounts.</para>
<para>This report gives effectively the same information as the Chart of Accounts.
You can use this report to export and print the Chart of Accounts.</para>
-<para>Note: To generate a report of account totals over a particular time period
-(especially if you do not close your books at regular intervals), you might
-consider using the Income Statement, or Cash Flow reports.</para>
+<note>
+ <para>To generate a report of account totals over a particular time period
+ (especially if you do not close your books at regular intervals), you might
+ consider using the Income Statement, or Cash Flow reports.</para>
+</note>
</sect3>
<sect3 id="rpt_futsched">
@@ -8975,9 +8977,8 @@ an empty report will be generated.</para>
-USD (USD)
-EUR (EUR)
-HKD (HKD)
-
-Note: the currency of each account is shown in parenthesis.
- </literallayout>
+ </literallayout>
+ <note><para>The currency of each account is shown in parenthesis.</para></note>
<para>Since in this example you mostly work in USD, all of the parent
accounts are set to USD. Of course, if you mostly work in Euros, you could
@@ -9305,9 +9306,8 @@ Note: the currency of each account is shown in parenthesis.
-Equity (USD)
-Opening Balances (USD)
-USD (USD)
-
-Note: the currency of each account is shown in parenthesis.
- </literallayout>
+ </literallayout>
+ <note><para>The currency of each account is shown in parenthesis.</para></note>
<para>First you need to transfer some money ($10,000) to Jamaica, and
you use your US bank account (with a balance of $100,000) for
@@ -11595,9 +11595,9 @@ Translators:
<para>L’ultimo passo consiste nell’individuare il metodo di svalutazione da utilizzare. Questo argomento verrà discusso nelle pagine seguenti.</para>
- <note>
- <para>ATTENZIONE: si presti attenzione al fatto che diversi Paesi possono avere politiche sulle imposte sostanzialmente diverse per quanto riguarda il deprezzamento; questo documento fornisce solamente delle nozioni di base in modo che poi ognuno possa applicare la politica sulle imposte e sul deprezzamento che interessa nel caso specifico.</para>
- </note>
+ <warning>
+ <para>Si presti attenzione al fatto che diversi Paesi possono avere politiche sulle imposte sostanzialmente diverse per quanto riguarda il deprezzamento; questo documento fornisce solamente delle nozioni di base in modo che poi ognuno possa applicare la politica sulle imposte e sul deprezzamento che interessa nel caso specifico.</para>
+ </warning>
</sect2>
</sect1>
commit c1ca7dc7b1123cf5db34ca0d267b9654d47bbfd9
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Jan 30 22:43:37 2020 +0100
L12N:ja: Remove redundant leading words in the admonition blocks
diff --git a/guide/ja/ch_currency.xml b/guide/ja/ch_currency.xml
index 1275e7a..9bdbcb5 100644
--- a/guide/ja/ch_currency.xml
+++ b/guide/ja/ch_currency.xml
@@ -74,9 +74,8 @@ Xã®å ´åˆã¯<menuchoice><guimenu>&appname;</guimenu><guimenuitem>è¨å®š</guimen
-USD (USD)
-EUR (EUR)
-HKD (HKD)
-
-注: ãã‚Œãžã‚Œã®å‹˜å®šç§‘ç›®ã®é€šè²¨ã¯å°æ‹¬å¼§ã§è¡¨ç¤ºã—ã¦ã„ã¾ã™ã€‚
-</literallayout>
+ </literallayout>
+ <note><para>ãã‚Œãžã‚Œã®å‹˜å®šç§‘ç›®ã®é€šè²¨ã¯å°æ‹¬å¼§ã§è¡¨ç¤ºã—ã¦ã„ã¾ã™ã€‚</para></note>
<para>ã“ã®ä¾‹ã§ã¯ã€ã»ã¨ã‚“ã©ç±³ãƒ‰ãƒ«ã§é‹ç”¨ã™ã‚‹ã®ã§ã€è¦ªå‹˜å®šç§‘ç›®ã®ã™ã¹ã¦ã‚’米ドルã«è¨å®šã—ã¦ã„ã¾ã™ã€‚
ã»ã¨ã‚“ã©ãƒ¦ãƒ¼ãƒã§é‹ç”¨ã™ã‚‹ãªã‚‰ã€å½“然ã€ã“れらã®è¦ªå‹˜å®šç§‘ç›®ã®é€šè²¨ã‚’ユーãƒã«å¤‰æ›´ã—ã¾ã™ã€‚
@@ -351,9 +350,8 @@ srccredit="Geert Janssens" /> </imageobject>
-純資産 (USD)
-開始残高
-USD (USD)
-
-注: ãã‚Œãžã‚Œã®å‹˜å®šç§‘ç›®ã®é€šè²¨ã¯å°æ‹¬å¼§ã§è¡¨ç¤ºã—ã¦ã„ã¾ã™ã€‚
-</literallayout>
+ </literallayout>
+ <note><para>ãã‚Œãžã‚Œã®å‹˜å®šç§‘ç›®ã®é€šè²¨ã¯å°æ‹¬å¼§ã§è¡¨ç¤ºã—ã¦ã„ã¾ã™ã€‚</para></note>
<para>最åˆã«ã€ã„ãらã‹ã®ãŠé‡‘ (10,000ドル) をジャマイカ銀行勘定科目ã«è³‡é‡‘移動ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ãŸã‚ã«ã„ã¤ã‚‚ã®ç±³å›½éŠ€è¡Œå‹˜å®šç§‘ç›®
(貸借残高100,000ドル) を使用ã—ã¾ã™ã€‚
diff --git a/guide/ja/ch_dep.xml b/guide/ja/ch_dep.xml
index b54aca1..669f23b 100644
--- a/guide/ja/ch_dep.xml
+++ b/guide/ja/ch_dep.xml
@@ -108,11 +108,10 @@ linkend="dep_example1" />ã‚’å‚ç…§ã—ã¦ãã ã•ã„)。
<para>最後ã®æ‰‹é †ã¯ã€ä½¿ç”¨ã™ã‚‹æ¸›ä¾¡å„Ÿå´ã®æ–¹æ³•ã‚’決定ã™ã‚‹ã“ã¨ã§ã™ã€‚
ã“ã‚Œã¯æ¬¡ã«èª¬æ˜Žã—ã¾ã™ã€‚</para>
- <note>
- <para>è¦å‘Š:
-国ãŒç•°ãªã‚Œã°æ¸›ä¾¡å„Ÿå´ã«é–¢ã™ã‚‹å®Ÿè³ªçš„ãªç¨Žæ”¿ç–ãŒç•°ãªã‚‹ã“ã¨ã«æ°—を付ã‘ã¦ãã ã•ã„。
+ <warning>
+ <para>国ãŒç•°ãªã‚Œã°æ¸›ä¾¡å„Ÿå´ã«é–¢ã™ã‚‹å®Ÿè³ªçš„ãªç¨Žæ”¿ç–ãŒç•°ãªã‚‹ã“ã¨ã«æ°—を付ã‘ã¦ãã ã•ã„。
本書を通ã—ã¦æä¾›ã—ã¦ã„ã‚‹ã®ã¯ã€å®Ÿéš›ã«ã¯ã€<quote>ãŠæ°—ã«å…¥ã‚Š</quote>ã®èª²ç¨Ž/減価償å´æ–¹æ³•ã‚’é©ç”¨ã™ã‚‹ã®ã‚’助ã‘ã‚‹ãŸã‚ã®ã€æ ¹åº•ã«ã‚る知è˜ã®ä¸€éƒ¨ã§ã™ã€‚</para>
- </note>
+ </warning>
</sect2>
</sect1>
diff --git a/guide/ja/ch_loans.xml b/guide/ja/ch_loans.xml
index 255b83c..e88bbaa 100644
--- a/guide/ja/ch_loans.xml
+++ b/guide/ja/ch_loans.xml
@@ -252,8 +252,7 @@ ieffã‹ã‚‰iã¾ã§å¤‰æ›ã™ã‚‹ãŸã‚ã«ã¯æ¬¡ã®å¼ã‚’使用ã—ã¾ã™ã€‚
連続的ãªåˆ©çŽ‡: <emphasis>i = ln[(1+ieff)^PF]</emphasis></literallayout>
<note>
- <para>注æ„:
-以é™ã§èª¬æ˜Žã™ã‚‹ã€é‡‘èžå–引ã®ãŸã‚ã®æ–¹ç¨‹å¼ã§ã¯ã€ã™ã¹ã¦ã®åˆ©çŽ‡ãŒå®ŸåŠ¹åˆ©çŽ‡<quote>ieff</quote>ã§ã™ã€‚
+ <para>以é™ã§èª¬æ˜Žã™ã‚‹ã€é‡‘èžå–引ã®ãŸã‚ã®æ–¹ç¨‹å¼ã§ã¯ã€ã™ã¹ã¦ã®åˆ©çŽ‡ãŒå®ŸåŠ¹åˆ©çŽ‡<quote>ieff</quote>ã§ã™ã€‚
ç°¡æ½”ã«ã™ã‚‹ãŸã‚ã«ã€æ–‡å—ã§ã¯å˜ã«<quote>i</quote>ã¨è¡¨è¨˜ã—ã¾ã™ã€‚</para>
</note>
</sect3>
commit e465a181312db64beada7145c3c730403eb3ccda
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Jan 30 22:25:23 2020 +0100
L12N:ru: Remove redundant leading words in the admonition blocks
diff --git a/guide/ru/ch_currency.xml b/guide/ru/ch_currency.xml
index ff8994f..e9fddb1 100644
--- a/guide/ru/ch_currency.xml
+++ b/guide/ru/ch_currency.xml
@@ -91,9 +91,8 @@
-USD (USD)
-EUR (EUR)
-HKD (HKD)
-
-Note: the currency of each account is shown in parenthesis.
- </literallayout>
+ </literallayout>
+ <note><para>The currency of each account is shown in parenthesis.</para></note>
<para>Since in this example you mostly work in USD, all of the parent
accounts are set to USD. Of course, if you mostly work in Euros, you could
@@ -459,9 +458,8 @@ Note: the currency of each account is shown in parenthesis.
-Equity (USD)
-Opening Balances (USD)
-USD (USD)
-
-Note: the currency of each account is shown in parenthesis.
- </literallayout>
+ </literallayout>
+ <note><para>The currency of each account is shown in parenthesis.</para></note>
<para>First you need to transfer some money ($10,000) to Jamaica, and
you use your US bank account (with a balance of $100,000) for
diff --git a/guide/ru/ch_dep.xml b/guide/ru/ch_dep.xml
index c5a4f60..33a800f 100644
--- a/guide/ru/ch_dep.xml
+++ b/guide/ru/ch_dep.xml
@@ -140,12 +140,12 @@
<para>The last step is to determine the method of depreciation that you
want to use. This will be discussed on the next few pages.</para>
- <note>
- <para>Warning: Be aware that different countries can have
+ <warning>
+ <para>Be aware that different countries can have
substantially different tax policies for depreciation; all that this
document can really provide is some of the underlying ideas to help
you apply your <quote>favorite</quote> tax/depreciation policies.</para>
- </note>
+ </warning>
</sect2>
</sect1>
diff --git a/guide/ru/ch_loans.xml b/guide/ru/ch_loans.xml
index 3f4b4f0..3f5ef5b 100644
--- a/guide/ru/ch_loans.xml
+++ b/guide/ru/ch_loans.xml
@@ -318,7 +318,7 @@ Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
</literallayout>
<note>
- <para>NOTE: in the equations below for the financial transaction,
+ <para>In the equations below for the financial transaction,
all interest rates are the effective interest rate, <quote>ieff</quote>. For the
sake of brevity, the symbol will be shortened to just <quote>i</quote>.</para>
</note>
diff --git a/guide/ru/ch_reports.xml b/guide/ru/ch_reports.xml
index 7bd0b7e..21aceb0 100644
--- a/guide/ru/ch_reports.xml
+++ b/guide/ru/ch_reports.xml
@@ -560,9 +560,11 @@ particular date. By default, this report shows accounts and totals
down to third-level subaccounts.</para>
<para>This report gives effectively the same information as the Chart of Accounts.
You can use this report to export and print the Chart of Accounts.</para>
-<para>Note: To generate a report of account totals over a particular time period
-(especially if you do not close your books at regular intervals), you might
-consider using the Income Statement, or Cash Flow reports.</para>
+<note>
+ <para>To generate a report of account totals over a particular time period
+ (especially if you do not close your books at regular intervals), you might
+ consider using the Income Statement, or Cash Flow reports.</para>
+</note>
</sect3>
<sect3 id="rpt_futsched">
diff --git a/guide/ru/ch_txns.xml b/guide/ru/ch_txns.xml
index dbd04a0..b75acae 100644
--- a/guide/ru/ch_txns.xml
+++ b/guide/ru/ch_txns.xml
@@ -350,7 +350,7 @@
information, you need to look at the individual splits that make up the
transaction.</para>
<note>
- <para>Note: An account register displays a transaction when that
+ <para>An account register displays a transaction when that
transaction has a split assigned to the account. If a given transaction
has more than one split assigned to the account, then in Basic and
Auto-Split views, that transaction will appear in the register one
commit d835a6a7f04c92fcbb71eccb8a8588a119d38730
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Jan 30 22:10:36 2020 +0100
L12N:pt: Remove redundant leading words in the admonition blocks
diff --git a/guide/pt/ch_currency.xml b/guide/pt/ch_currency.xml
index 68f1544..13f50aa 100644
--- a/guide/pt/ch_currency.xml
+++ b/guide/pt/ch_currency.xml
@@ -83,9 +83,8 @@
-USD (USD)
-EUR (EUR)
-HKD (HKD)
-
-Nota: a moeda de cada conta é mostrada entre parênteses.
- </literallayout>
+ </literallayout>
+ <note><para>A moeda de cada conta é mostrada entre parênteses.</para></note>
<para>Dado que neste exemplo se trabalha principalmente em EUR, todas as contas-mãe estão definidas
em EUR. Claro que, se trabalhar principalmente com USD, pode alterar esta definição. Os totais
@@ -410,9 +409,8 @@ Nota: a moeda de cada conta é mostrada entre parênteses.
-Capital próprio (USD)
-Saldos iniciais
-USD (USD)
-
-Nota: a moeda de cada conta é mostrada entre parênteses.
- </literallayout>
+ </literallayout>
+ <note><para>A moeda de cada conta é mostrada entre parênteses.</para></note>
<para>Primeiro tem de transferir o dinheiro para a Jamaica (10.000€), usando a sua
conta bancária normal (com um saldo de 100.000€). O banco indica uma taxa de câmbio de
diff --git a/guide/pt/ch_dep.xml b/guide/pt/ch_dep.xml
index b5fdba1..db5498a 100644
--- a/guide/pt/ch_dep.xml
+++ b/guide/pt/ch_dep.xml
@@ -140,12 +140,12 @@
<para>The last step is to determine the method of depreciation that you
want to use. This will be discussed on the next few pages.</para>
- <note>
- <para>Warning: Be aware that different countries can have
+ <warning>
+ <para>Be aware that different countries can have
substantially different tax policies for depreciation; all that this
document can really provide is some of the underlying ideas to help
you apply your <quote>favorite</quote> tax/depreciation policies.</para>
- </note>
+ </warning>
</sect2>
</sect1>
diff --git a/guide/pt/ch_loans.xml b/guide/pt/ch_loans.xml
index cbbc8c3..cf42059 100644
--- a/guide/pt/ch_loans.xml
+++ b/guide/pt/ch_loans.xml
@@ -269,7 +269,7 @@ Juro contÃnuo: <emphasis>i = ln[(1+ief)^FP]</emphasis>
</literallayout>
<note>
- <para>NOTA: nas equações abaixo para a transação financeira, todas as taxas de juro são efetivas, <quote>ief</quote>.</para>
+ <para>Nas equações abaixo para a transação financeira, todas as taxas de juro são efetivas, <quote>ief</quote>.</para>
</note>
</sect3>
commit bba80c0cdb053f46c660381385f36e076ea46e5d
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Jan 30 21:39:12 2020 +0100
L12N:de: Remove redundant leading words in the admonition blocks
diff --git a/guide/de/ch_currency.xml b/guide/de/ch_currency.xml
index c37e7f9..c576377 100644
--- a/guide/de/ch_currency.xml
+++ b/guide/de/ch_currency.xml
@@ -82,9 +82,8 @@
-USD (USD)
-EUR (EUR)
-HKD (HKD)
-
-Beachten Sie, dass die Währung jedes Kontos in Klammern gesetzt ist.
</literallayout>
+ <note><para>Beachten Sie, dass die Währung jedes Kontos in Klammern gesetzt ist.</para></note>
<para>Da Sie in diesem Beispiel meist in EUR arbeiten, werden alle Oberkonten
in EUR eingerichtet. Wenn Sie natürlich meist in USD arbeiten, können Sie die Währung dieser Oberkonten auch nach USD ändern.
@@ -409,9 +408,8 @@ Beachten Sie, dass die Währung jedes Kontos in Klammern gesetzt ist.
-Eigenkapital (EUR)
-Anfangsbestand
-EUR (EUR)
-
-Beachten Sie, dass die Währung jedes Kontos in Klammern gesetzt ist.
- </literallayout>
+ </literallayout>
+ <note><para>Beachten Sie, dass die Währung jedes Kontos in Klammern gesetzt ist.</para></note>
<para>Zuerst müssen Sie Geld (10.000,- €) nach Jamaika überweisen und dafür
Ihr normales EUR Bankkonto nutzen (mit einem Anfangsbestand von 100.000,- EUR).
diff --git a/guide/de/ch_dep.xml b/guide/de/ch_dep.xml
index 62ea662..9435489 100644
--- a/guide/de/ch_dep.xml
+++ b/guide/de/ch_dep.xml
@@ -141,12 +141,12 @@
<para>The last step is to determine the method of depreciation that you
want to use. This will be discussed on the next few pages.</para>
- <note>
- <para>Warning: Be aware that different countries can have
+ <warning>
+ <para>Be aware that different countries can have
substantially different tax policies for depreciation; all that this
document can really provide is some of the underlying ideas to help
you apply your <quote>favorite</quote> tax/depreciation policies.</para>
- </note>
+ </warning>
</sect2>
</sect1>
diff --git a/guide/de/ch_loans.xml b/guide/de/ch_loans.xml
index 84fdaf6..030316c 100644
--- a/guide/de/ch_loans.xml
+++ b/guide/de/ch_loans.xml
@@ -318,7 +318,7 @@ kontinuierliche Verzinsung: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
</literallayout>
<note>
- <para>Hinweis: in den unten stehenden Gleichungen für Geldgeschäfte
+ <para>In den unten stehenden Gleichungen für Geldgeschäfte
sind alle Zinssätze die effektiven Zinssätze, <quote>ieff</quote>.
Aus Gründen der Kürze wird statt <quote>ieff</quote> nur <quote>i</quote>benutzt. </para>
</note>
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index 2f340df..3f57020 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -336,7 +336,7 @@
Für mehr Informationen können Sie in die einzelnen Teilbuchungen schauen, die die mehrteilige Buchung ausmachen.</para>
<note>
- <para>Anmerkung: Ein Kontenblatt zeigt eine Buchung an, wenn eine Teilbuchung
+ <para>Ein Kontenblatt zeigt eine Buchung an, wenn eine Teilbuchung
dieser Buchung diesem Konto zugeordnet ist. Wenn eine gegebene Buchung mehr
als eine (Teil-)Buchung hat, die einem einzelnen Konto zugeordnet ist, dann
wird diese Buchung in der Buchungsansicht einmal für jede Teilbuchung
commit 5ee9d0806965ac415ff62b844c0d94444ac25b03
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Jan 30 20:46:33 2020 +0100
Minor improvements on last commit
diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index c20affd..de305c6 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -91,9 +91,8 @@
-USD (USD)
-EUR (EUR)
-HKD (HKD)
-
-<emphasis role="bold">Note:</emphasis> the currency of each account is shown in parenthesis.
</literallayout>
+ <note><para>The currency of each account is shown in parenthesis.</para></note>
<para>Since in this example you mostly work in USD, all of the parent
accounts are set to USD. Of course, if you mostly work in Euros, you could
@@ -459,9 +458,8 @@
-Equity (USD)
-Opening Balances (USD)
-USD (USD)
-
-<emphasis role="bold">Note:</emphasis> the currency of each account is shown in parenthesis.
- </literallayout>
+ </literallayout>
+ <note><para>The currency of each account is shown in parenthesis.</para></note>
<para>First you need to transfer some money ($10,000) to Jamaica, and
you use your US bank account (with a balance of $100,000) for
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index d54d0b8..809b933 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -803,9 +803,11 @@ particular date. By default, this report shows accounts and totals
down to third-level subaccounts.</para>
<para>This report gives effectively the same information as the Chart of Accounts.
You can use this report to export and print the Chart of Accounts.</para>
-<para><emphasis role="bold">Note:</emphasis> To generate a report of account totals over a particular time period
-(especially if you do not close your books at regular intervals), you might
-consider using the Income Statement, or Cash Flow reports.</para>
+<note>
+ <para>To generate a report of account totals over a particular time period
+ (especially if you do not close your books at regular intervals), you might
+ consider using the Income Statement, or Cash Flow reports.</para>
+</note>
</sect3>
<sect3 id="rpt_balance_forecast">
commit a162fec621cfdcd1c39778b6fbd79f7d1de19bf4
Author: Xu Xinhang <xuxinhang4567#126.com>
Date: Thu Jan 30 16:22:43 2020 +0800
Remove redundant leading words in the admonition blocks
diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index d1a906d..c20affd 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -92,7 +92,7 @@
-EUR (EUR)
-HKD (HKD)
-Note: the currency of each account is shown in parenthesis.
+<emphasis role="bold">Note:</emphasis> the currency of each account is shown in parenthesis.
</literallayout>
<para>Since in this example you mostly work in USD, all of the parent
@@ -460,7 +460,7 @@ Note: the currency of each account is shown in parenthesis.
-Opening Balances (USD)
-USD (USD)
-Note: the currency of each account is shown in parenthesis.
+<emphasis role="bold">Note:</emphasis> the currency of each account is shown in parenthesis.
</literallayout>
<para>First you need to transfer some money ($10,000) to Jamaica, and
diff --git a/guide/C/ch_dep.xml b/guide/C/ch_dep.xml
index c5a4f60..33a800f 100644
--- a/guide/C/ch_dep.xml
+++ b/guide/C/ch_dep.xml
@@ -140,12 +140,12 @@
<para>The last step is to determine the method of depreciation that you
want to use. This will be discussed on the next few pages.</para>
- <note>
- <para>Warning: Be aware that different countries can have
+ <warning>
+ <para>Be aware that different countries can have
substantially different tax policies for depreciation; all that this
document can really provide is some of the underlying ideas to help
you apply your <quote>favorite</quote> tax/depreciation policies.</para>
- </note>
+ </warning>
</sect2>
</sect1>
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index a0f66e7..33b6c60 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -318,7 +318,7 @@ Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis>
</literallayout>
<note>
- <para>NOTE: in the equations below for the financial transaction,
+ <para>In the equations below for the financial transaction,
all interest rates are the effective interest rate, <quote>ieff</quote>. For the
sake of brevity, the symbol will be shortened to just <quote>i</quote>.</para>
</note>
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 7f9c6f9..d54d0b8 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -803,7 +803,7 @@ particular date. By default, this report shows accounts and totals
down to third-level subaccounts.</para>
<para>This report gives effectively the same information as the Chart of Accounts.
You can use this report to export and print the Chart of Accounts.</para>
-<para>Note: To generate a report of account totals over a particular time period
+<para><emphasis role="bold">Note:</emphasis> To generate a report of account totals over a particular time period
(especially if you do not close your books at regular intervals), you might
consider using the Income Statement, or Cash Flow reports.</para>
</sect3>
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 40d0156..972521f 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -361,7 +361,7 @@
information, you need to look at the individual splits that make up the
transaction.</para>
<note>
- <para>Note: An account register displays a transaction when that
+ <para>An account register displays a transaction when that
transaction has a split assigned to the account. If a given transaction
has more than one split assigned to the account, then in Basic and
Auto-Split views, that transaction will appear in the register one
@@ -1569,4 +1569,4 @@
</orderedlist>
</sect3>
</sect2>
-</sect1>
\ No newline at end of file
+</sect1>
Summary of changes:
guide/C/ch_currency.xml | 8 +++-----
guide/C/ch_dep.xml | 6 +++---
guide/C/ch_loans.xml | 2 +-
guide/C/ch_reports.xml | 8 +++++---
guide/C/ch_txns.xml | 4 ++--
guide/de/ch_currency.xml | 8 +++-----
guide/de/ch_dep.xml | 6 +++---
guide/de/ch_loans.xml | 2 +-
guide/de/ch_txns.xml | 2 +-
guide/it/gnucash-guide.xml | 28 ++++++++++++++--------------
guide/ja/ch_currency.xml | 10 ++++------
guide/ja/ch_dep.xml | 7 +++----
guide/ja/ch_loans.xml | 3 +--
guide/pt/ch_currency.xml | 10 ++++------
guide/pt/ch_dep.xml | 6 +++---
guide/pt/ch_loans.xml | 2 +-
guide/ru/ch_currency.xml | 10 ++++------
guide/ru/ch_dep.xml | 6 +++---
guide/ru/ch_loans.xml | 2 +-
guide/ru/ch_reports.xml | 8 +++++---
guide/ru/ch_txns.xml | 2 +-
21 files changed, 66 insertions(+), 74 deletions(-)
More information about the gnucash-changes
mailing list