gnucash-docs master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Tue Dec 16 16:19:40 EST 2014


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/34252dce (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/44aaa76e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/507a4212 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/b3005534 (commit)



commit 34252dce0dd99f96883d7429efce4b1c0e36cbdf
Merge: b300553 44aaa76
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Dec 16 15:38:44 2014 -0800

    Merge branch 'maint'


commit 44aaa76ea927c48c2afe18ad51ea052556195555
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Dec 16 14:36:38 2014 -0800

    Release 2.6.5

diff --git a/NEWS b/NEWS
index 91f75d9..7446602 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Version History
 ---------------
+ 2.6.5  - 16 December 2014
+        o Fix a path of freshly added XML files
+        o Add some comments about translation to the German documents where the translation wasn't updated to match the English version.
+	o Apply &untranslated property in German translations
+        o Fix path of newly-added XML files.
+	o Bug 739380 - Release tarball build fails. Git builds OK.
+
  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.
diff --git a/configure.ac b/configure.ac
index 0f95b3f..5fbb1d1 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.4)
+AC_INIT(gnucash-docs, 2.6.5)
 
 dnl ==========================================================================
 dnl
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 1af5d6d..542f91a 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.4">
-<!ENTITY date "28 September 2014">
+<!ENTITY manrevision "2.6.5">
+<!ENTITY date "16 December 2014">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.4">
+<!ENTITY vers-stable "2.6.5">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -72,8 +72,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.4
-  Last modified: 28 September 2014
+  Version: 2.6.5
+  Last modified: 16 December 2014
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 8f43d02..13dff4c 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.4">
-<!ENTITY date "28 September 2014">
+<!ENTITY manrevision "2.6.5">
+<!ENTITY date "16 December 2014">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.4">
+<!ENTITY vers-stable "2.6.5">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -82,8 +82,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.4
-  Last modified: 28 September 2014
+  Version: 2.6.5
+  Last modified: 16 December 2014
   Maintainers:
       GnuCash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -99,7 +99,7 @@
   <edition>V&manrevision;</edition>
 
   <copyright>
-   <year>2009-2013</year>
+   <year>2009-2014</year>
    <holder>&app; Documentation Team</holder>
   </copyright>
 
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 1cc8df0..c9f2f74 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -31,10 +31,10 @@
 <!--
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
---><!ENTITY manrevision "2.6.0">
-<!ENTITY date "29 December 2013">
+--><!ENTITY manrevision "2.6.5">
+<!ENTITY date "16 December 2014">
 <!ENTITY vers-unstable "trunk">
-<!ENTITY vers-stable "2.6.0">
+<!ENTITY vers-stable "2.6.5">
 <!ENTITY series-unstable "trunk">
 <!ENTITY series-stable "2.6">
 <!--
@@ -52,8 +52,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.0
-  Last modified: 29 December 2013
+  Version: 2.6.5
+  Last modified: 16 December 2014
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
@@ -64,10 +64,10 @@
 <!-- appropriate code -->
  <bookinfo>
   <title>Guida ai concetti e manuale di <application>&app;</application></title>
-  <edition>V2.6.0</edition>
+  <edition>V2.6.1</edition>
 
   <copyright>
-   <year>2009-2013</year>
+   <year>2009-2014</year>
    <holder>Gruppo della documentazione di &app;</holder>
   </copyright>
 
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index 2c4e8a5..4b0e643 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -38,7 +38,7 @@
   maintainance they should be collected here.
 -->
 <!ENTITY manrevision "2.6.0">
-<!ENTITY date "29 December 2012">
+<!ENTITY date "29 December 2013">
 <!ENTITY vers-unstable "trunk">
 <!ENTITY vers-stable "2.6.0">
 <!ENTITY series-unstable "trunk">
@@ -61,8 +61,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.2.1
-  Last modified: September 26, 2010
+  Version: 2.6.0
+  Last modified: 29 December 2013
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index e5e6ba7..0e215a5 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -29,10 +29,10 @@
   Some global declarations which are used in the files. For easier
   maintainance they should be collected here.
 -->
-<!ENTITY manrevision "2.6.4">
-<!ENTITY date "28 September 2014">
+<!ENTITY manrevision "2.6.5">
+<!ENTITY date "16 December 2014">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.4">
+<!ENTITY vers-stable "2.6.5">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -63,8 +63,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.4
-  Last modified: 28 September 2014
+  Version: 2.6.5
+  Last modified: 16 December 2014
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index 4f53504..6ea9a4f 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.4">
-<!ENTITY date "28 September 2014">
+<!ENTITY manrevision "2.6.5">
+<!ENTITY date "16 December 2014">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.4">
+<!ENTITY vers-stable "2.6.5">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -63,8 +63,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.4
-  Last modified: 28 September 2014
+  Version: 2.6.5
+  Last modified: 16 December 2014
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 820eb7a..84efbd8 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.4">
-<!ENTITY date "28 September 2014">
+<!ENTITY manrevision "2.6.5">
+<!ENTITY date "16 December 2014">
 <!ENTITY vers-unstable "master">
-<!ENTITY vers-stable "2.6.4">
+<!ENTITY vers-stable "2.6.5">
 <!ENTITY series-unstable "master">
 <!ENTITY series-stable "2.6">
 <!--
@@ -45,8 +45,8 @@
 -->
 <!--
       (Do not remove this comment block.)
-  Version: 2.6.4
-  Last modified: 28 September 2014
+  Version: 2.6.5
+  Last modified: 16 December 2014
   Maintainers:
         Gnucash Development Team <gnucash-devel at gnucash.org>
   Translators:

commit 507a42127f519f01c459b9a8a72e9f8d47058e35
Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
Date:   Tue Dec 2 20:43:10 2014 +0200

    guide: Fix a typo in the Transactions chapter.
    
    "formers" -> "former", introduced in 743743e0 ("Bug 639264 : Add
    Information about Starting Balance in reconcile window and revise the
    entire section.").
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741039

diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 3ddb5be..1d3497b 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -574,7 +574,7 @@
     
       <para>At the bottom of the account window, there are (among others) two running
       balances (the <guilabel>cleared</guilabel> and <guilabel>reconciled</guilabel> balance), and the 
-      <guilabel>total</guilabel> balance. The formers balances should correspond to how much money
+      <guilabel>total</guilabel> balance. The former balances should correspond to how much money
       the bank thinks you have in your account, while the latter includes outstanding transactions.</para>
 
       <para>For example, when you write a check for something, you should



Summary of changes:
 NEWS                       |  7 +++++++
 guide/C/ch_txns.xml        |  2 +-
 guide/C/gnucash-guide.xml  | 10 +++++-----
 guide/de/gnucash-guide.xml | 12 ++++++------
 guide/it/gnucash-guide.xml | 14 +++++++-------
 guide/ja/gnucash-guide.xml |  6 +++---
 help/C/gnucash-help.xml    | 10 +++++-----
 help/de/gnucash-help.xml   | 10 +++++-----
 help/it/gnucash-help.xml   | 10 +++++-----
 9 files changed, 44 insertions(+), 37 deletions(-)



More information about the gnucash-changes mailing list