gnucash-docs stable: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Sat May 4 18:22:15 EDT 2024 

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/5dce4d01 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b2fc0d71 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7f58ecbf (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/e16fc8db (commit)



commit 5dce4d015e2594ef3c983a853293b150a1838364
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat May 4 16:28:19 2024 +0200

    docbook: Improve entity untranslated
    
    Update wiki link,
    enable email

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 38d5f480..bf1e17b0 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -31,6 +31,7 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!--
   Some global declarations which are used in the files. For easier
   maintenance they are collected here.
+  Note that this entities are not available in gnc-gui-*.dtd files!
   
   1. a) Publication - should only be changed by the release manager!
 -->
diff --git a/docbook/gnc-gui-C.dtd b/docbook/gnc-gui-C.dtd
index b7b1bfe1..f9c39850 100644
--- a/docbook/gnc-gui-C.dtd
+++ b/docbook/gnc-gui-C.dtd
@@ -448,9 +448,9 @@
 
 <!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="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
-  <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.'>
+    url="https://wiki.gnucash.org/wiki/Documentation_Translation">
+    <citetitle>Gnucash wiki: Translating the GnuCash Guide and Manual</citetitle></ulink>.
+  Questions can be discussed at the <email>gnucash-XX at gnucash.org</email> mailing list.'>
 
 <!ENTITY untranslated "%untranslated;">
 
diff --git a/docbook/gnc-gui-de.dtd b/docbook/gnc-gui-de.dtd
index 876ad9b8..e7be1c59 100644
--- a/docbook/gnc-gui-de.dtd
+++ b/docbook/gnc-gui-de.dtd
@@ -444,9 +444,9 @@
 <!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="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
-    <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.'>
+    url="https://wiki.gnucash.org/wiki/Documentation_Translation">
+    <citetitle>Gnucash wiki: Translating the GnuCash Guide and Manual</citetitle></ulink>.
+  Fragen können auf der deutschsprachigen Mailingliste <email>gnucash-de at gnucash.org</email> diskutiert werden.'>
 
 
 <!-- Include "gnc-gui-C.dtd" -->
diff --git a/docbook/gnc-gui-pt.dtd b/docbook/gnc-gui-pt.dtd
index 1aeae01e..52ee6a87 100644
--- a/docbook/gnc-gui-pt.dtd
+++ b/docbook/gnc-gui-pt.dtd
@@ -7,9 +7,9 @@
 <!-- untranslated message -->
 <!ENTITY % untranslated 'Caro leitor, lamentamos, ainda ninguém ofereceu uma tradução
   para as secções seguintes. Se quiser ajudar, siga as instruções na <ulink
-  url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+  url="https://wiki.gnucash.org/wiki/Documentation_Translation">
   <citetitle>Wiki do Gnucash: como traduzir o guia e/ou os ficheiros de ajuda do GnuCash</citetitle></ulink>.
-  Questões podem ser discutidas na lista gnucash-user at gnucash.org o gnucash-br at gnucash.org.'>
+  Questões podem ser discutidas na lista <email>gnucash-user at gnucash.org</email> o <email>gnucash-br at gnucash.org</email>.'>
 
 <!-- Include "gnc-gui-C.dtd" -->
 <!ENTITY % gnc-gui-C SYSTEM "gnc-gui-C.dtd">
diff --git a/docbook/gnc-gui-ru.dtd b/docbook/gnc-gui-ru.dtd
index 342c82ba..7e64e88e 100644
--- a/docbook/gnc-gui-ru.dtd
+++ b/docbook/gnc-gui-ru.dtd
@@ -9,9 +9,9 @@
 <!-- untranslated message -->
 <!ENTITY % untranslated 'Дорогой пользователь, нам очень жаль, но никто не перевел до сих пор
   следующие части документации. Если вы хотите помочь нам, следуйте инструкциям на
-  <ulink url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
-  <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
-  Свои вопросы вы можете задать в списке рассылки gnucash-user at gnucash.org.'>
+  url="https://wiki.gnucash.org/wiki/Documentation_Translation">
+    <citetitle>Gnucash wiki: Translating the GnuCash Guide and Manual</citetitle></ulink>.
+  Свои вопросы вы можете задать в списке рассылки <email>gnucash-user at gnucash.org</email>.'>
 
 <!-- Include "gnc-gui-C.dtd" -->
 <!ENTITY % gnc-gui-C SYSTEM "gnc-gui-C.dtd">
diff --git a/docbook/gnc-gui-zh.dtd b/docbook/gnc-gui-zh.dtd
index abff7f38..fec1f116 100644
--- a/docbook/gnc-gui-zh.dtd
+++ b/docbook/gnc-gui-zh.dtd
@@ -445,8 +445,8 @@
 -->
 
 <!ENTITY % untranslated '很抱歉，下文尚未提供翻译。如果您愿意，可以按照<ulink
-    url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
-  <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>的指引帮助我们完善翻译。更多问题可在gnucash-zh at gnucash.org邮件列表进行讨论。'>
+    url="https://wiki.gnucash.org/wiki/Documentation_Translation">
+    <citetitle>Gnucash wiki: Translating the GnuCash Guide and Manual</citetitle></ulink>的指引帮助我们完善翻译。更多问题可在gnucash-zh at gnucash.org邮件列表进行讨论。'>
 <!ENTITY untranslated "%untranslated;">
 
 

commit b2fc0d712dc7c2277d790226ad11d1a3a33357ce
Author: Christian Wehling <christian.wehling at web.de>
Date:   Tue Apr 30 22:14:48 2024 +0200

    docbook: use entitiy for url-wiki

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index bd57a9d7..38d5f480 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -136,29 +136,29 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY url-src-stable "https://github.com/Gnucash/gnucash/tree/stable/"> <!-- Append the desired topic -->
 
 <!ENTITY url-wiki "https://wiki.gnucash.org/wiki/">  <!-- You could append the desired topic, but better create a separate entity. -->
-<!ENTITY url-wiki-de "https://wiki.gnucash.org/wiki/De/">  <!-- German root -->
-<!ENTITY url-wiki-api-custom "https://wiki.gnucash.org/wiki/Custom_Reports#The_GnuCash_API">
-<!ENTITY url-wiki-api-using "https://wiki.gnucash.org/wiki/Using_the_API">
-<!ENTITY url-wiki-bus-feat "https://wiki.gnucash.org/wiki/Business_Features_Issues">
-<!ENTITY url-wiki-faq "https://wiki.gnucash.org/wiki/FAQ">
-<!ENTITY url-wiki-faq-de "https://wiki.gnucash.org/wiki/De/FAQ">
-<!ENTITY url-wiki-faq-quot "https://wiki.gnucash.org/wiki/FAQ#Q:_How_do_I_fix_a_.22system_error.22_or_.22unknown_error.22_when_getting_stock_quotes.3F">
-<!ENTITY url-wiki-irc "https://wiki.gnucash.org/wiki/IRC">
-<!ENTITY url-wiki-L12N "https://wiki.gnucash.org/wiki/Translation">
-<!ENTITY url-wiki-L12N-tax "https://wiki.gnucash.org/wiki/Translation#How_to_create_localized_Income_Tax_Tables">
-<!ENTITY url-wiki-locale "https://wiki.gnucash.org/wiki/Locale_Settings">
-<!ENTITY url-wiki-ml "https://wiki.gnucash.org/wiki/Mailing_Lists">
-<!ENTITY url-wiki-ml-de "https://wiki.gnucash.org/wiki/De/Feedback#Auf_der_Mailingliste">
-<!ENTITY url-wiki-pmt-term "https://wiki.gnucash.org/wiki/Payment_Terms">
-<!ENTITY url-wiki-ofx "https://wiki.gnucash.org/wiki/Setting_up_OFXDirectConnect">
-<!ENTITY url-wiki-ofx-banks "https://wiki.gnucash.org/wiki/OFX_Direct_Connect_Bank_Settings">
-<!ENTITY url-wiki-OQ "https://wiki.gnucash.org/wiki/Online_Quotes">
-<!ENTITY url-wiki-qif "https://wiki.gnucash.org/wiki/Quicken_Migration">
-<!ENTITY url-wiki-xslt "https://wiki.gnucash.org/wiki/De/export_to_excel_xls_transform">
-<!ENTITY url-wiki-lots "https://wiki.gnucash.org/wiki/Concept_of_Lots">
+<!ENTITY url-wiki-de "&url-wiki;De/">  <!-- German root -->
+<!ENTITY url-wiki-api-custom "&url-wiki;Custom_Reports#The_GnuCash_API">
+<!ENTITY url-wiki-api-using "&url-wiki;Using_the_API">
+<!ENTITY url-wiki-bus-feat "&url-wiki;Business_Features_Issues">
+<!ENTITY url-wiki-faq "&url-wiki;FAQ">
+<!ENTITY url-wiki-faq-de "&url-wiki;De/FAQ">
+<!ENTITY url-wiki-faq-quot "&url-wiki;FAQ#Q:_How_do_I_fix_a_.22system_error.22_or_.22unknown_error.22_when_getting_stock_quotes.3F">
+<!ENTITY url-wiki-irc "&url-wiki;IRC">
+<!ENTITY url-wiki-L12N "&url-wiki;Translation">
+<!ENTITY url-wiki-L12N-tax "&url-wiki;Translation#How_to_create_localized_Income_Tax_Tables">
+<!ENTITY url-wiki-locale "&url-wiki;Locale_Settings">
+<!ENTITY url-wiki-ml "&url-wiki;Mailing_Lists">
+<!ENTITY url-wiki-ml-de "&url-wiki;De/Feedback#Auf_der_Mailingliste">
+<!ENTITY url-wiki-pmt-term "&url-wiki;Payment_Terms">
+<!ENTITY url-wiki-ofx "&url-wiki;Setting_up_OFXDirectConnect">
+<!ENTITY url-wiki-ofx-banks "&url-wiki;OFX_Direct_Connect_Bank_Settings">
+<!ENTITY url-wiki-OQ "&url-wiki;Online_Quotes">
+<!ENTITY url-wiki-qif "&url-wiki;Quicken_Migration">
+<!ENTITY url-wiki-xslt "&url-wiki;De/export_to_excel_xls_transform">
+<!ENTITY url-wiki-lots "&url-wiki;Concept_of_Lots">
   <!-- wiki Special: translation is done by mediawiki: -->
-<!ENTITY url-wiki-category "https://wiki.gnucash.org/wiki/Special:Categories">
-<!ENTITY url-wiki-search "https://wiki.gnucash.org/wiki/Special:Search">
+<!ENTITY url-wiki-category "&url-wiki;Special:Categories">
+<!ENTITY url-wiki-search "&url-wiki;Special:Search">
 
 <!-- b) Third party URLs: -->
 <!ENTITY url-av "https://www.alphavantage.co/"> <!-- A F::Q source, which requires registration -->

commit 7f58ecbffb919d35c77d1bdfff6632153ea0f4f4
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sun Apr 28 14:30:20 2024 +0200

    Revert "All: Improve entity untranslated"
    
    This reverts commit 180624f149026cae36e736e9891096b607fe50a3.
    
    Because the processing sequence is gnc-gui-${LANG}.dtd --> gnc-gui-C.dtd
    --> gnc-gui-struct.dtd --> gnc-docbookx.dtd, the entities from
    gnc-docbook.dtd cannot be used in the language files.

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 358f0ee8..bd57a9d7 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -135,7 +135,6 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY url-src "https://github.com/Gnucash/gnucash/">
 <!ENTITY url-src-stable "https://github.com/Gnucash/gnucash/tree/stable/"> <!-- Append the desired topic -->
 
-<!ENTITY lbl-wiki "&appname; wiki:">  <!-- Start of the link label. -->
 <!ENTITY url-wiki "https://wiki.gnucash.org/wiki/">  <!-- You could append the desired topic, but better create a separate entity. -->
 <!ENTITY url-wiki-de "https://wiki.gnucash.org/wiki/De/">  <!-- German root -->
 <!ENTITY url-wiki-api-custom "https://wiki.gnucash.org/wiki/Custom_Reports#The_GnuCash_API">
@@ -146,8 +145,6 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY url-wiki-faq-quot "https://wiki.gnucash.org/wiki/FAQ#Q:_How_do_I_fix_a_.22system_error.22_or_.22unknown_error.22_when_getting_stock_quotes.3F">
 <!ENTITY url-wiki-irc "https://wiki.gnucash.org/wiki/IRC">
 <!ENTITY url-wiki-L12N "https://wiki.gnucash.org/wiki/Translation">
-<!ENTITY lbl-wiki-L10N-docs "Documentation_Translation">
-<!ENTITY url-wiki-L10N-docs "&url-wiki;&lbl-wiki-L10N-docs;">
 <!ENTITY url-wiki-L12N-tax "https://wiki.gnucash.org/wiki/Translation#How_to_create_localized_Income_Tax_Tables">
 <!ENTITY url-wiki-locale "https://wiki.gnucash.org/wiki/Locale_Settings">
 <!ENTITY url-wiki-ml "https://wiki.gnucash.org/wiki/Mailing_Lists">
diff --git a/docbook/gnc-gui-C.dtd b/docbook/gnc-gui-C.dtd
index 63597411..b7b1bfe1 100644
--- a/docbook/gnc-gui-C.dtd
+++ b/docbook/gnc-gui-C.dtd
@@ -448,9 +448,9 @@
 
 <!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="&url-wiki-L10N-docs;">
-    <citetitle>&lbl-wiki; &lbl-wiki-L10N-docs;</citetitle></ulink>.
-  Questions can be discussed at the <<email>gnucash-XX at gnucash.org</email> mailing list.'>
+    url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+  <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.'>
 
 <!ENTITY untranslated "%untranslated;">
 
diff --git a/docbook/gnc-gui-de.dtd b/docbook/gnc-gui-de.dtd
index 5a28cd8d..876ad9b8 100644
--- a/docbook/gnc-gui-de.dtd
+++ b/docbook/gnc-gui-de.dtd
@@ -444,9 +444,9 @@
 <!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="&url-wiki-L10N-docs;">
-    <citetitle>&lbl-wiki; &lbl-wiki-L10N-docs;</citetitle></ulink>.
-  Fragen können auf der deutschsprachigen Mailingliste <email>gnucash-de at gnucash.org</email> diskutiert werden.'>
+    url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+    <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.'>
 
 
 <!-- Include "gnc-gui-C.dtd" -->
diff --git a/docbook/gnc-gui-pt.dtd b/docbook/gnc-gui-pt.dtd
index 3a566e31..1aeae01e 100644
--- a/docbook/gnc-gui-pt.dtd
+++ b/docbook/gnc-gui-pt.dtd
@@ -7,9 +7,9 @@
 <!-- untranslated message -->
 <!ENTITY % untranslated 'Caro leitor, lamentamos, ainda ninguém ofereceu uma tradução
   para as secções seguintes. Se quiser ajudar, siga as instruções na <ulink
-    url="&url-wiki-L10N-docs;">
-    <citetitle>&lbl-wiki; &lbl-wiki-L10N-docs;</citetitle></ulink>.
-  Questões podem ser discutidas na lista gnucash-user at gnucash.org o <email>gnucash-br at gnucash.org</email>.'>
+  url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+  <citetitle>Wiki do Gnucash: como traduzir o guia e/ou os ficheiros de ajuda do GnuCash</citetitle></ulink>.
+  Questões podem ser discutidas na lista gnucash-user at gnucash.org o gnucash-br at gnucash.org.'>
 
 <!-- Include "gnc-gui-C.dtd" -->
 <!ENTITY % gnc-gui-C SYSTEM "gnc-gui-C.dtd">
diff --git a/docbook/gnc-gui-ru.dtd b/docbook/gnc-gui-ru.dtd
index 6ef43221..342c82ba 100644
--- a/docbook/gnc-gui-ru.dtd
+++ b/docbook/gnc-gui-ru.dtd
@@ -8,9 +8,10 @@
 
 <!-- untranslated message -->
 <!ENTITY % untranslated 'Дорогой пользователь, нам очень жаль, но никто не перевел до сих пор
-  следующие ч"&url-wiki-L10N-docs;">
-    <citetitle>&lbl-wiki; &lbl-wiki-L10N-docs;</citetitle></ulink>.
-  Свои вопросы вы можете задать в списке рассылки <email>gnucash-user at gnucash.org</email>.'>
+  следующие части документации. Если вы хотите помочь нам, следуйте инструкциям на
+  <ulink url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+  <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
+  Свои вопросы вы можете задать в списке рассылки gnucash-user at gnucash.org.'>
 
 <!-- Include "gnc-gui-C.dtd" -->
 <!ENTITY % gnc-gui-C SYSTEM "gnc-gui-C.dtd">
diff --git a/docbook/gnc-gui-zh.dtd b/docbook/gnc-gui-zh.dtd
index c3e0ed7b..abff7f38 100644
--- a/docbook/gnc-gui-zh.dtd
+++ b/docbook/gnc-gui-zh.dtd
@@ -445,8 +445,8 @@
 -->
 
 <!ENTITY % untranslated '很抱歉，下文尚未提供翻译。如果您愿意，可以按照<ulink
-    url="&url-wiki-L10N-docs;">
-    <citetitle>&lbl-wiki; &lbl-wiki-L10N-docs;</citetitle></ulink>的指引帮助我们完善翻译。更多问题可在gnucash-zh at gnucash.org邮件列表进行讨论。'>
+    url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+  <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>的指引帮助我们完善翻译。更多问题可在gnucash-zh at gnucash.org邮件列表进行讨论。'>
 <!ENTITY untranslated "%untranslated;">
 
 



Summary of changes:
 docbook/gnc-docbookx.dtd | 48 +++++++++++++++++++++++-------------------------
 docbook/gnc-gui-C.dtd    |  6 +++---
 docbook/gnc-gui-de.dtd   |  4 ++--
 docbook/gnc-gui-pt.dtd   |  6 +++---
 docbook/gnc-gui-ru.dtd   |  5 +++--
 docbook/gnc-gui-zh.dtd   |  4 ++--
 6 files changed, 36 insertions(+), 37 deletions(-)

More information about the gnucash-changes mailing list