gnucash-docs master: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Mon Jun 8 01:02:49 EDT 2020
Updated via https://github.com/Gnucash/gnucash-docs/commit/cfef19d7 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/4add6842 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d8621f77 (commit)
from https://github.com/Gnucash/gnucash-docs/commit/306fc9fe (commit)
commit cfef19d72a492365aded9dfdfdc42ab260674675
Merge: 306fc9f 4add684
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Jun 8 07:02:32 2020 +0200
Merge branch 'maint'
commit 4add6842b2258a63db86f1667b901c48d1dbb8fd
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Jun 8 06:49:49 2020 +0200
Bug 797783 - Reverse "over" and "under" estimate of the unrealized
... capital gain: de, pt
Only ja remains unchecked
diff --git a/guide/de/ch_capgain.xml b/guide/de/ch_capgain.xml
index 647d22e..0f9014a 100644
--- a/guide/de/ch_capgain.xml
+++ b/guide/de/ch_capgain.xml
@@ -225,8 +225,8 @@
<para>Es ergeben sich drei Möglichkeiten. Sie können den nichtrealiserten Gewinn <emphasis>genau geschätzt
</emphasis>, ihn
- <emphasis>unterschätzt</emphasis> oder
- <emphasis>überschätzt</emphasis> haben.</para>
+ <emphasis>überschätzt</emphasis> oder
+ <emphasis>unterschätzt</emphasis> haben.</para>
<orderedlist>
<listitem>
@@ -318,13 +318,13 @@
</listitem>
<listitem>
- <para><emphasis>Überschätzung</emphasis> des nichtrealisierten
+ <para><emphasis>Unterschätzung</emphasis> des nichtrealisierten
Gewinns.</para>
<para>Sie waren überoptimistisch hinsichtlich des Wertes des Gemäldes.
Anstelle der 130.000,- €, die als Wert des Gemäldes annahmen, werden Ihnen
nur 120.000,- € geboten. Dennoch entscheiden Sie sich immer noch zum Verkauf, denn Sie schätzen
- 120.000,- € mehr als das Gemälde. Die Zahlen ändern sich ein wenig,
+ 120.000,- € mehr als das Gemälde. Die Zahlen ändern sich ein wenig,
aber nicht zu dramatisch.</para>
<para>Die Buchungen sollten nun wie folgt erscheinen (beachten Sie die
@@ -396,7 +396,7 @@
</listitem>
<listitem>
- <para><emphasis>Unterschätzung</emphasis> des nichtrealisierten
+ <para><emphasis>Überschätzung</emphasis> des nichtrealisierten
Gewinns.</para>
<para>Sie schaffen es, Ihr Gemälde zu einem Preis zu verkaufen, der höher ist, als in Ihren wildesten Träumen
diff --git a/guide/pt/ch_capgain.xml b/guide/pt/ch_capgain.xml
index d6ca18e..9d6e445 100644
--- a/guide/pt/ch_capgain.xml
+++ b/guide/pt/ch_capgain.xml
@@ -195,8 +195,8 @@
vender a pintura.</para>
<para>Surgem três possibilidades. Pode ter <emphasis>valorizado precisamente</emphasis> o ganho
- não realizado, <emphasis>subvalorizado</emphasis> o ganho não realizado, ou
- <emphasis>sobrevalorizado</emphasis> o ganho não realizado.</para>
+ não realizado, <emphasis>sobrevalorizado</emphasis> o ganho não realizado, ou
+ <emphasis>subvalorizado</emphasis> o ganho não realizado.</para>
<orderedlist>
<listitem>
@@ -284,7 +284,7 @@
</listitem>
<listitem>
- <para><emphasis>Subvalorização</emphasis> de ganhos não realizados.</para>
+ <para><emphasis>Sobrevalorização</emphasis> de ganhos não realizados.</para>
<para>Foi demasiado otimista sobre o valor da pintura. Em vez dos 130.000€ que pensava
que a pintura valia, só lhe oferecem 120.000€. Mas mesmo assim decide vender, porque
@@ -357,7 +357,7 @@
</listitem>
<listitem>
- <para><emphasis>Sobrevalorização</emphasis> de ganhos não realizados.</para>
+ <para><emphasis>Subvalorização</emphasis> de ganhos não realizados.</para>
<para>Conseguiu vender a pintura por um valor acima dos seus sonhos, por 150.000€.
O valor extra é, de novo, registado como ganho, i.e., receita.</para>
commit d8621f7752d45b62e8d5e13a25bb2bc4e73fb44c
Author: Hong Xu <hong at topbug.net>
Date: Mon Jun 8 06:27:21 2020 +0200
Bug 797783 - Reverse "over" and "under" estimate of the unrealized
... capital gain: en, it, ru
The explanation text shows that they should be the other way around.
diff --git a/guide/C/ch_capgain.xml b/guide/C/ch_capgain.xml
index 86b9a92..4d2f307 100644
--- a/guide/C/ch_capgain.xml
+++ b/guide/C/ch_capgain.xml
@@ -227,8 +227,8 @@
<para>Three possibilities arise. You may have <emphasis>accurately
estimated</emphasis> the unrealized gain,
- <emphasis>underestimated</emphasis> the unrealized gain, or
- <emphasis>overestimated</emphasis> the unrealized gain.</para>
+ <emphasis>overestimated</emphasis> the unrealized gain, or
+ <emphasis>underestimated</emphasis> the unrealized gain.</para>
<orderedlist>
<listitem>
@@ -321,7 +321,7 @@
</listitem>
<listitem>
- <para><emphasis>Under estimation</emphasis> of unrealized
+ <para><emphasis>Over estimation</emphasis> of unrealized
gain.</para>
<para>You were over-optimistic about the value of the painting.
@@ -398,7 +398,7 @@
</listitem>
<listitem>
- <para><emphasis>Over estimation</emphasis> of unrealized
+ <para><emphasis>Under estimation</emphasis> of unrealized
gain.</para>
<para>You manage to sell your painting for more than you thought in
diff --git a/guide/it/it.po b/guide/it/it.po
index d1b279c..72cfe58 100644
--- a/guide/it/it.po
+++ b/guide/it/it.po
@@ -14542,12 +14542,12 @@ msgstr ""
#: C/gnucash-guide.xml:225(para)
msgid ""
"Three possibilities arise. You may have <emphasis>accurately estimated</"
-"emphasis> the unrealized gain, <emphasis>underestimated</emphasis> the "
-"unrealized gain, or <emphasis>overestimated</emphasis> the unrealized gain."
+"emphasis> the unrealized gain, <emphasis>overestimated</emphasis> the "
+"unrealized gain, or <emphasis>underestimated</emphasis> the unrealized gain."
msgstr ""
"Si presentano tre possibilità : si potrebbero aver <emphasis>correttamente "
-"stimato</emphasis> i guadagni non realizzati, <emphasis>sottostimato</"
-"emphasis> i guadagni non realizzati o <emphasis>sovrastimato</emphasis> i "
+"stimato</emphasis> i guadagni non realizzati, <emphasis>sovrastimato</"
+"emphasis> i guadagni non realizzati o <emphasis>sottostimato</emphasis> i "
"guadagni non realizzati."
#: C/gnucash-guide.xml:232(para)
diff --git a/guide/ru/ch_capgain.xml b/guide/ru/ch_capgain.xml
index d2b7487..b58adcf 100644
--- a/guide/ru/ch_capgain.xml
+++ b/guide/ru/ch_capgain.xml
@@ -227,8 +227,8 @@
<para>Three possibilities arise. You may have <emphasis>accurately
estimated</emphasis> the unrealized gain,
- <emphasis>underestimated</emphasis> the unrealized gain, or
- <emphasis>overestimated</emphasis> the unrealized gain.</para>
+ <emphasis>overestimated</emphasis> the unrealized gain, or
+ <emphasis>underestimated</emphasis> the unrealized gain.</para>
<orderedlist>
<listitem>
@@ -321,7 +321,7 @@
</listitem>
<listitem>
- <para><emphasis>Under estimation</emphasis> of unrealized
+ <para><emphasis>Over estimation</emphasis> of unrealized
gain.</para>
<para>You were over-optimistic about the value of the painting.
@@ -398,7 +398,7 @@
</listitem>
<listitem>
- <para><emphasis>Over estimation</emphasis> of unrealized
+ <para><emphasis>Under estimation</emphasis> of unrealized
gain.</para>
<para>You manage to sell your painting for more than you thought in
Summary of changes:
guide/C/ch_capgain.xml | 8 ++++----
guide/de/ch_capgain.xml | 10 +++++-----
guide/it/it.po | 8 ++++----
guide/pt/ch_capgain.xml | 8 ++++----
guide/ru/ch_capgain.xml | 8 ++++----
5 files changed, 21 insertions(+), 21 deletions(-)
More information about the gnucash-changes
mailing list