gnucash-docs master: Multiple changes pushed
Frank H. Ellenberger
fell at code.gnucash.org
Fri Nov 28 14:53:29 EST 2014
Updated via https://github.com/Gnucash/gnucash-docs/commit/b3005534 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/67fbd650 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d94a03da (commit)
via https://github.com/Gnucash/gnucash-docs/commit/f9797ee7 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d0e2c7e7 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/f85e0592 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/d10c5792 (commit)
from https://github.com/Gnucash/gnucash-docs/commit/062389db (commit)
commit b3005534b2c402d62a357d5ac3adaac99af7cacb
Merge: 062389d 67fbd65
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Nov 28 19:15:18 2014 +0100
Merge branch 'maint'
Conflicts:
configure.ac
commit 67fbd650c638177e9ab01c220acc0c5d0e905bf4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Nov 28 16:44:25 2014 +0100
Apply &untranslated; in guide/de
Additional a few comments, where the translation is no longer syncron
with the english text
diff --git a/guide/de/ch_basics.xml b/guide/de/ch_basics.xml
index 57b5c1d..72e24f0 100644
--- a/guide/de/ch_basics.xml
+++ b/guide/de/ch_basics.xml
@@ -125,6 +125,7 @@
<sect2 id="basics-accountingdouble2">
<title>Doppelte Buchführung</title>
<indexterm><primary>Buchführung</primary><secondary>Doppik</secondary></indexterm>
+
<para>Die Bilanzgleichung ist das Kernstück der Doppelten
Buchführung. Für jede Veränderung im Wert eines Kontos muss es
eine ausgleichende Buchung in einem anderen Konto geben. Dieses
@@ -134,6 +135,10 @@
Buchführung. Wenn Sie mit &app; arbeiten, werden Sie immer mit
mindestens 2 Konten zu tun haben, damit die Bilanzgleichung
ausgeglichen bleibt.</para>
+
+<!-- FIXME! Die folgenden beiden Absätze wurden im englischen Text ersetzt.
+ &untranslated; -->
+
<para>Die doppelte Buchführung dient zwei Zielen. Das erste ist
es, eine buchhalterische Spur zu erzeugen. Geld muss immer von
irgendwo kommen und irgendwo hingehen. Darüber hinaus diente
@@ -144,6 +149,7 @@
Aufkommen der Computer ist die Wahrscheinlichkeit mathematischer
Fehler natürlich kleiner geworden, aber es ist beruhigend zu
wissen, dass das Konzept weiterhin existiert!</para>
+
<para>Die doppelte Buchführung wurde 1494 von dem italienischen
Mönch Luca Pacioli in seinem mathematischen
Lehrbuch <quote>Summa de Arithmetica</quote> erstmals
@@ -195,6 +201,15 @@
Konten und ein Konto enthält viele Buchungen. Diese Unterteilung
ist fundamental, um zu verstehen, wie &app; benutzt wird.</para>
+<!-- FIXME!
+Unterteilung stimmt nicht mehr
+ <sect2 id="basics-files2">
+ <title>Files</title>
+ &untranslated;
+ SQL, ... fehlt über und
+ <sect2 id="basics-transactions2">
+ unter basics-accounts2 -->
+
<sect2 id="basics-accounts2">
<title>Dateien, Konten und Buchungen</title>
<indexterm><primary>Dateneingabe</primary><secondary>Konten</secondary></indexterm>
diff --git a/guide/de/ch_capgain.xml b/guide/de/ch_capgain.xml
index fada92f..733caf9 100644
--- a/guide/de/ch_capgain.xml
+++ b/guide/de/ch_capgain.xml
@@ -1,5 +1,5 @@
<chapter id="chapter_capgain">
<title>Kapitalerträge</title>
- <para>...</para>
+ <para>&untranslated;</para>
</chapter>
diff --git a/guide/de/ch_oth_assets.xml b/guide/de/ch_oth_assets.xml
index 404420e..599f5e2 100644
--- a/guide/de/ch_oth_assets.xml
+++ b/guide/de/ch_oth_assets.xml
@@ -1,5 +1,5 @@
<chapter id="chapter_other_assets">
<title>Andere Aktiva</title>
- <para>...</para>
+ <para>&untranslated;</para>
</chapter>
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index c2ef6e8..8c89de7 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -1277,6 +1277,7 @@
<filename>gcashdata_3emptyAccts</filename> gespeichert ist und spreichern Sie diese sofort unter
<filename>gcashdata_4</filename>. Das Hauptfenster sollte wie folgt aussehen:
</para>
+<note><para>&untranslated;</para></note>
<!--
<screenshot id="txns-puttoget1-Charts">
commit d94a03dac2f1c884b56df424833126f88574cd49
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Nov 28 16:39:25 2014 +0100
Add an entity "untranslated" to mark partial translations
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index fc336aa..1af5d6d 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -50,6 +50,18 @@
transliterate "GnuCash" here.
-->
<!ENTITY app "GnuCash">
+<!--
+ Translators:
+ If you can only offer a partial translation, that is fine.
+ Just inform the reader and potential successors about the state by inserting
+ the (localized) "&untranslated;" entity and commenting off the still untranslated part.
+ You should localize the &untranslated; text, e.g. name the user group of your language.
+-->
+<!ENTITY untranslated 'Dear Reader, we are really sorry, but nobody offered a translation
+ for the following parts. If you would like to help us, follow the instructions at <ulink
+ url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
+ <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
+ Questions can be discussed at the gnucash-XX at gnucash.org mailing list.'>
]>
<!--
(Do not remove this comment block.)
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index f832e48..8f43d02 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -57,6 +57,19 @@
transliterate "GnuCash" here.
-->
<!ENTITY app "GnuCash">
+<!--
+ Translators:
+ If you can only offer a partial translation, that is fine.
+ Just inform the reader and potential successors about the state by inserting
+ the (localized) "&untranslated;" entity and commenting off the still untranslated part.
+ You should localize the &untranslated; text, e.g. name the user group of your language.
+-->
+<!ENTITY untranslated 'Geehrte Leser, leider hat bisher niemand eine Ãœbersetzung
+ der folgenden Teile erstellt. Falls Sie uns dabei helfen möchten, folgen Sie
+ bitte der Anleitung in <ulink
+ url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
+ <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
+ Fragen können auf der deutschsprachigen Mailingliste gnucash-de at gnucash.org diskutiert werden.'>
]>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index fd82ece..e5e6ba7 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -41,6 +41,18 @@
transliterate "GnuCash" here.
-->
<!ENTITY app "GnuCash">
+<!--
+ Translators:
+ If you can only offer a partial translation, that is fine.
+ Just inform the reader and potential successors about the state by inserting
+ the (localized) "&untranslated;" entity and commenting off the still untranslated part.
+ You should localize the &untranslated; text, e.g. name the user group of your language.
+-->
+<!ENTITY untranslated 'Dear Reader, we are really sorry, but nobody offered a translation
+ for the following parts. If you would like to help us, follow the instructions at <ulink
+ url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
+ <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
+ Questions can be discussed at the gnucash-XX at gnucash.org mailing list.'>
]>
<!--
(Do not remove this comment block.)
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index b05fa6f..4f53504 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -40,6 +40,19 @@
transliterate "GnuCash" here.
-->
<!ENTITY app "GnuCash">
+<!--
+ Translators:
+ If you can only offer a partial translation, that is fine.
+ Just inform the reader and potential successors about the state by inserting
+ the (localized) "&untranslated;" entity and commenting off the still untranslated part.
+ You should localize the &untranslated; text, e.g. name the user group of your language.
+-->
+<!ENTITY untranslated 'Geehrte Leser, leider hat bisher niemand eine Ãœbersetzung
+ der folgenden Teile erstellt. Falls Sie uns dabei helfen möchten, folgen Sie
+ bitte der Anleitung in <ulink
+ url="http://wiki.gnucash.org/wiki/Translation#How_to_translate_the_GnuCash_guide_and.2For_help_files">
+ <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
+ Fragen können auf der deutschsprachigen Mailingliste gnucash-de at gnucash.org diskutiert werden.'>
]>
<!--
(Do not remove this comment block.)
commit f9797ee7cd5ec1b9cbde0d73d7f3f119a8f371de
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 23 16:06:09 2014 -0800
Correct an error about equity being increased by a credit.
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 2fac965..881eff6 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -164,8 +164,8 @@
<para>In traditional double-entry accounting, the left column in the
register is used for debits, while the right column is used for credits.
- Accountants record increases in asset, expense, and equity accounts on the
- debit (left) side, and they record increases in liability, revenue, and capital
+ Accountants record increases in asset and expense accounts on the
+ debit (left) side, and they record increases in liability, revenue, and equity
accounts on the credit (right) side. <application>&app;</application>
follows this convention in the register.</para>
commit d0e2c7e790c2cd9cb556abab23a90f1f5265162b
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Nov 9 12:11:22 2014 +0100
Fix path of freshly added xml files
diff --git a/Makefile.am b/Makefile.am
index bce54fa..3d3445d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,8 @@ EXTRA_DIST = gnucash-docs.spec \
xsl \
HACKING \
README \
- gothic.xml \
- mincho.xml \
+ fonts/gothic.xml \
+ fonts/mincho.xml \
fonts/ume-tgo4.ttf \
fonts/ume-tmo3.ttf \
fonts/README.Fonts
commit f85e05922da07559008ceee86d73e61beed3fe56
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Nov 9 12:09:13 2014 +0100
Bug 739380 - Release tarball build fails. Git builds OK.
diff --git a/Makefile.am b/Makefile.am
index 67501ac..bce54fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,8 @@ EXTRA_DIST = gnucash-docs.spec \
xsl \
HACKING \
README \
+ gothic.xml \
+ mincho.xml \
fonts/ume-tgo4.ttf \
fonts/ume-tmo3.ttf \
fonts/README.Fonts
commit d10c5792ab79733503faaab1b558a96a0d638e7f
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 27 18:36:09 2014 -0700
Release 2.6.4
diff --git a/NEWS b/NEWS
index 1385d84..91f75d9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,43 @@
Version History
---------------
+ 2.6.4 - 28 September 2014
+ o Add sentence about manually editing payment information for customers.
+ o Add warning and tip about account separator character.
+ o Correct field format in python-import-fields.
+ o Currency movements .. remain fully balanced if "Trading Accounts"
+ is enabled; "double entry" was not sufficient.
+ o Ersetze umgangssprachliches "Passiva" durch "Fremdkapital" und
+ zugehöriges Bild
+ o German translation of Transactions chapter.
+ o Guide C oview: update processor architecture: "backport" from de
+ o Guide C txns: Add a warning about dummy transactions and auditors.
+ o Guide C txns: Thinking is not enough for the cleared state of a
+ transaction
+ o Guide C txns: Upgrade note to warning "It is important to understand
+ that reconciliation..."
+ o Guide C txns: explain reconcilation state "cleared"; improved
+ wording by lmat
+ o Guide de ch_accts: Several minor corrections.
+ o Guide de ch_basics: several corrections.
+ o Guide de ch_oview: orthography and processor architecture update.
+ o Guide de ch_txns: several improvements, txns-sxn1 complete.
+ o Help Documentation: Add Advanced Portfolio Rpt details, Thanks to
+ Chris Good
+ o Improve explanation that Credit does NOT decrease equity accounts
+ o Improve readability of "Credit does NOT decrease ...".
+ o New chapters in the German translation: Overview, Basics, and
+ Accounts. Thanks to Mechtilde.
+ o Reduced proportional width of description column to increase overall
+ font size for a 510 pixel width image.
+ o Remove a few discrepancies between the german guide overview and
+ other components.
+ o Update of translators in gnucash-guide-de.omf
+ o Updated documentation to explain how to tie dividends received in
+ cash to the appropriate stock holding.
+
2.6.3 - 30 March 2014
o There have been no documentation changes since 2.6.2
+
2.6.2 - 2 March 2014
o Bug 547386 - Help text for Employee section missing.
o Bug 723173 - One error and some typos in documentation. Thanks to
diff --git a/configure.ac b/configure.ac
index 0434de7..0f95b3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# copyright (c) 2003-2013 GnuCash Development Team
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gnucash-docs, 2.6.3)
+AC_INIT(gnucash-docs, 2.6.4)
dnl ==========================================================================
dnl
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 5a8fe44..fc336aa 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -38,10 +38,10 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.3">
-<!ENTITY date "30 March 2014">
+<!ENTITY manrevision "2.6.4">
+<!ENTITY date "28 September 2014">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.3">
+<!ENTITY vers-stable "2.6.4">
<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
@@ -60,8 +60,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.3
- Last modified: 30 March 2014
+ Version: 2.6.4
+ Last modified: 28 September 2014
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -276,6 +276,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v2.6.3</revnumber>
+ <date>30 March 2014</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.2</revnumber>
<date>2 March 2014</date>
<revdescription>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index e1f27ae..f832e48 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -45,10 +45,10 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.3">
-<!ENTITY date "30 March 2014">
+<!ENTITY manrevision "2.6.4">
+<!ENTITY date "28 September 2014">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.3">
+<!ENTITY vers-stable "2.6.4">
<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
@@ -69,8 +69,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.3
- Last modified: 30 March 2014
+ Version: 2.6.4
+ Last modified: 28 September 2014
Maintainers:
GnuCash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -290,6 +290,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Tutorial and Concepts Guide v2.6.3</revnumber>
+ <date>30 March 2014</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Tutorial and Concepts Guide v2.6.2</revnumber>
<date>2 March 2014</date>
<revdescription>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 19c8465..fd82ece 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -29,11 +29,11 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.3">
-<!ENTITY date "30 March 2014">
+<!ENTITY manrevision "2.6.4">
+<!ENTITY date "28 September 2014">
<!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.3">
-<!ENTITY series-unstable "trunk">
+<!ENTITY vers-stable "2.6.4">
+<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
Translators:
@@ -51,8 +51,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.3
- Last modified: 30 March 2014
+ Version: 2.6.4
+ Last modified: 28 September 2014
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -195,6 +195,14 @@
<revhistory>
<revision>
+ <revnumber>&app; Help Manual v2.6.3</revnumber>
+ <date>30 March 2014</date>
+ <revdescription>
+ <para role="author">Multiple authors</para>
+ <para role="publisher">&app; Documentation Team</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>&app; Help Manual v2.6.2</revnumber>
<date>2 March 2014</date>
<revdescription>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 3106062..b05fa6f 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -28,10 +28,10 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.3">
-<!ENTITY date "30 March 2014">
-<!ENTITY vers-unstable "trunk">
-<!ENTITY vers-stable "2.6.3">
+<!ENTITY manrevision "2.6.4">
+<!ENTITY date "28 September 2014">
+<!ENTITY vers-unstable "master">
+<!ENTITY vers-stable "2.6.4">
<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
@@ -50,8 +50,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.3
- Last modified: 30 March 2014
+ Version: 2.6.4
+ Last modified: 28 September 2014
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -238,6 +238,16 @@
<revhistory>
<revision>
+ <revnumber>&app; Hilfe v2.6.3</revnumber>
+ <date>30 March 2014</date>
+ <revdescription>
+ <para role="author">Multiple Authors
+ </para>
+ <para role="publisher">&app; Development Team</para>
+ </revdescription>
+ </revision>
+
+ <revision>
<revnumber>&app; Hilfe v2.6.2</revnumber>
<date>2 March 2014</date>
<revdescription>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index e965019..820eb7a 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -23,10 +23,10 @@
Some global declarations which are used in the files. For easier
maintainance they should be collected here.
-->
-<!ENTITY manrevision "2.6.3">
-<!ENTITY date "30 March 2014">
-<!ENTITY vers-unstable "trunk">
-<!ENTITY vers-stable "2.6.3">
+<!ENTITY manrevision "2.6.4">
+<!ENTITY date "28 September 2014">
+<!ENTITY vers-unstable "master">
+<!ENTITY vers-stable "2.6.4">
<!ENTITY series-unstable "master">
<!ENTITY series-stable "2.6">
<!--
@@ -45,8 +45,8 @@
-->
<!--
(Do not remove this comment block.)
- Version: 2.6.3
- Last modified: 30 March 2014
+ Version: 2.6.4
+ Last modified: 28 September 2014
Maintainers:
Gnucash Development Team <gnucash-devel at gnucash.org>
Translators:
@@ -203,6 +203,14 @@
<revhistory>
<revision>
+ <revnumber>Manuale di aiuto di &app; v2.6.3</revnumber>
+ <date>30 Marzo 2014</date>
+ <revdescription>
+ <para role="author">Vari autori</para>
+ <para role="publisher">Gruppo della documentazione di &app;</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>Manuale di aiuto di &app; v2.6.2</revnumber>
<date>2 Marzo 2014</date>
<revdescription>
Summary of changes:
Makefile.am | 2 ++
NEWS | 36 ++++++++++++++++++++++++++++++++++++
guide/C/ch_basics.xml | 4 ++--
guide/C/gnucash-guide.xml | 30 +++++++++++++++++++++++++-----
guide/de/ch_basics.xml | 15 +++++++++++++++
guide/de/ch_capgain.xml | 2 +-
guide/de/ch_oth_assets.xml | 2 +-
guide/de/ch_txns.xml | 1 +
guide/de/gnucash-guide.xml | 31 ++++++++++++++++++++++++++-----
help/C/gnucash-help.xml | 32 ++++++++++++++++++++++++++------
help/de/gnucash-help.xml | 35 +++++++++++++++++++++++++++++------
help/it/gnucash-help.xml | 20 ++++++++++++++------
12 files changed, 178 insertions(+), 32 deletions(-)
More information about the gnucash-changes
mailing list