gnucash-htdocs beta: Multiple changes pushed

Frank H.Ellenberger fell at code.gnucash.org
Wed Oct 7 13:31:35 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash-htdocs/commit/4f6b8c07 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/e7b3b8f9 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/1c4219d9 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/6e63d96f (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/8c38f99f (commit)
	from  https://github.com/Gnucash/gnucash-htdocs/commit/0444b4e9 (commit)



commit 4f6b8c07459d970f4b893e7f31431e27c253e72d
Merge: 8c38f99 e7b3b8f
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 7 19:31:17 2020 +0200

    Merge branch 'master' into beta


commit e7b3b8f90b2100d3ce3e4b0e3ed4370b2712209d
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 7 19:27:00 2020 +0200

    Fix a few tags in older news

diff --git a/news/160628-2.6.13.news b/news/160628-2.6.13.news
index b8065df..0cf102e 100644
--- a/news/160628-2.6.13.news
+++ b/news/160628-2.6.13.news
@@ -56,13 +56,13 @@
 <p>Concurrent with the release of Gnucash 2.6.13 we're pleased to also release a new version 2.6.13 of the companion <em>Help</em> and <em>Tutorial and Concepts Guide</em>.</p>
 <ul>
   <li>Fix the very stale Release Schedule link in the Guide.</li>
-    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id="63704"> Bug 637004 - Document Payable/Receivable Aging Rpts and new options for  allowing customer and vendor address info to display.</a></li>
+    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=63704"> Bug 637004 - Document Payable/Receivable Aging Rpts and new options for  allowing customer and vendor address info to display.</a></li>
     <li>Fix unclear statement re docbook stylesheets in README.</li>
-    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id="712764"> Bug 712764 - Clarify Account type designations in the Tutorial.</a></li>
-    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id="751686"> Bug 751686 - Explain how to use Find Transaction to report per-employee.</a></li>
-    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id="754239"> Bug 754239 - Fix order of Report menu items.</a></li>
-    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id="754239"> Bug 754239 - Update Report menu item names to Save Report Configuration.</a></li>
-    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id="765131"> Bug 765131 - Document Investment Return of Capital in the Guide.</a></li>
+    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=712764"> Bug 712764 - Clarify Account type designations in the Tutorial.</a></li>
+    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=751686"> Bug 751686 - Explain how to use Find Transaction to report per-employee.</a></li>
+    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=754239"> Bug 754239 - Fix order of Report menu items.</a></li>
+    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=754239"> Bug 754239 - Update Report menu item names to Save Report Configuration.</a></li>
+    <li> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=765131"> Bug 765131 - Document Investment Return of Capital in the Guide.</a></li>
 </ul>
 
 <h3>Getting GnuCash for Windows and MacOS X</h3>
diff --git a/news/191229-3.8.news b/news/191229-3.8.news
index b36e76d..2a54195 100644
--- a/news/191229-3.8.news
+++ b/news/191229-3.8.news
@@ -149,7 +149,7 @@
 <ul>
   <li>Replace web links with entities.</li>
   <li>Replace <code> tag with <command>. The latter is correct for Docbook.</li>
-  <li>Change the app entity to <app>GnuCash</app> for Gnome conformance.
+  <li>Change the app entity to <app&gtGnuCash</app&gt for Gnome conformance.
   <li>Use &app; for this case and &appname; for the undecorated "GnuCash".</li>
   <li>Series of updates to the Help manual Importing Transactions section to change the orientation more towards a description of the interface functionality in the help manual</li>
   <li>More work on cmake build system.</li>

commit 1c4219d9da9eb997fb9cc902e1b2a3628eb8b2bf
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 7 19:26:09 2020 +0200

    L10N:de: Fix a typo

diff --git a/locale/de/LC_MESSAGES/gnucash-htdocs.mo b/locale/de/LC_MESSAGES/gnucash-htdocs.mo
index 592fc81..cc7d2e9 100644
Binary files a/locale/de/LC_MESSAGES/gnucash-htdocs.mo and b/locale/de/LC_MESSAGES/gnucash-htdocs.mo differ
diff --git a/po/de.po b/po/de.po
index 94f31d4..be6ffcc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -396,7 +396,7 @@ msgid ""
 "provide you with the necessary information to get started."
 msgstr ""
 "Wenn Sie daran interessiert sind, die <span class=\"gnucash\">GnuCash</span> "
-"Documentation zu verbessern, sind Sie hier richtig. Diese Seite wird Ihnen "
+"Dokumentation zu verbessern, sind Sie hier richtig. Diese Seite wird Ihnen "
 "die zu Beginn erforderlichen Informationen liefern."
 
 #: develdocs.phtml:15

commit 6e63d96f05a984b9336e9ceb1b4cf62e6fcbb3a6
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 7 19:25:22 2020 +0200

    Fix a variable in news-script

diff --git a/news/news-script.php b/news/news-script.php
index 07b5696..e76c507 100644
--- a/news/news-script.php
+++ b/news/news-script.php
@@ -98,7 +98,8 @@ function generate_anchor($news_key)
 
 function print_news_item($fa, $n, $newsfile, $key, $anchor)
 {
-echo <<<ITEMEND
+  global $top_dir;
+  echo <<<ITEMEND
 <div class="newsborder">
   <div class="newsheader" style="display:inline-block;background-color:#CACAF7;width:100%">
     <div style="float:left;">

commit 8c38f99ffbb604fa087ef9b5f30679ae30d25361
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Oct 7 19:23:00 2020 +0200

    Add description to almost all pages
    
    But I have no idea for viewdoc.
    A few other minor improvements.
    I18N: 2 new messages, IIRC

diff --git a/2.6-release-tour.phtml b/2.6-release-tour.phtml
index eefe068..5ddde69 100644
--- a/2.6-release-tour.phtml
+++ b/2.6-release-tour.phtml
@@ -1,21 +1,19 @@
 <?php
 include("lang.php");
 $title = T_("GnuCash 2.6 release tour");
+$description = T_("This tour will introduce you to new major features in <span class=\"gnucash\">GnuCash</span> 2.6.");
 include("emulate_globals_on.php");
 include("$top_dir/externals/header.phtml");
 include("$top_dir/externals/menu.phtml");
 ?>
 
 <div id="content">
-<h1><?php echo T_($title);?></h1>
+<h1><?=$title?></h1>
 
 <div>
-<p>
-<?php echo T_("This tour will introduce you to new major features in <span class=\"gnucash\">GnuCash</span> 2.6.");?>
-</p>
+  <p><?=$description?></p>
 </div>
 
-
 <h2 class="featuretitle"><?php echo T_("Jqplot Reports");?></h2>
 <p class="justify">
 <?php echo T_("<span class=\"gnucash\">GnuCash</span> now uses javascript jqplot to render reports. This gives a more professional look to all graphical reports (piechart, barchart, scatterplot).");?>
diff --git a/develdocs.phtml b/develdocs.phtml
index a75af4b..6bc4738 100644
--- a/develdocs.phtml
+++ b/develdocs.phtml
@@ -1,6 +1,7 @@
 <?php 
 include("lang.php");
 $title = T_("Writing Documentation");
+$description = T_("If you are interested in improving the <span class=\"gnucash\">GnuCash</span> documentation, you have come to the right place. This page will provide you with the necessary information to get started.");
 include("emulate_globals_on.php");
 include("externals/header.phtml");
 include("externals/menu.phtml");
@@ -10,7 +11,7 @@ include("externals/menu.phtml");
 
 <h1><?php echo T_("Writing GnuCash Documentation");?></h1>
 
-<p class="justify"><?php echo T_("If you are interested in improving the <span class=\"gnucash\">GnuCash</span> documentation, you have come to the right place. This page will provide you with the necessary information to get started.");?></p>
+<p class="justify"><?=$description?></p>
 
 <p class="justify"><?php echo T_("Just as the <span class=\"gnucash\">GnuCash</span> application has been developed over time by volunteers, so too has the documentation been written by volunteer developers and users to help others learn how <span class=\"gnucash\">GnuCash</span> works. This collaborative effort has resulted in the creation of two major documents, the <b>Help Manual</b> and the <b>Tutorial and Concepts Guide</b>.");?></p>
 
diff --git a/docs.phtml b/docs.phtml
index 1b1a961..2843e63 100644
--- a/docs.phtml
+++ b/docs.phtml
@@ -8,6 +8,7 @@
    */
   include("lang.php");
   $title = T_("Documentation");
+  $description = T_("The following links are to the <strong>English HTML editions of the current stable branch</strong> documentation. See further down the page for other <span class=\"gnucash\">GnuCash</span> versions, languages, and formats.");
   $online = T_("Browse documentation online");
   $pdf = T_("Download documentation as PDF");
   $epub = T_("Download documentation as epub");
@@ -19,11 +20,11 @@
 
 <div id="content">
 
-  <h1><?php echo T_("GnuCash Documentation");?></h1>
+  <h1><?=$title?></h1>
 
   <p class="justify"><?php
 
-  echo T_("The following links are to the <strong>English HTML editions of the current stable branch</strong> documentation. See further down the page for other <span class=\"gnucash\">GnuCash</span> versions, languages, and formats.");
+  echo $description;
   echo T_("There are two major <span class=\"gnucash\">GnuCash</span> documentation packages to help users:");?></p>
   <ul>
     <li><a href="<?=$top_dir;?>/viewdoc.phtml?rev=<?=$major_stable;?>&lang=C&doc=help"><b><?php echo T_("The Help Manual");?></b></a></li>
diff --git a/donate.phtml b/donate.phtml
index d54bd2c..3d30b72 100644
--- a/donate.phtml
+++ b/donate.phtml
@@ -1,6 +1,7 @@
 <?php
   include ("lang.php");
   $title = T_ ( "Donations" );
+  $description = T_("<span class=\"gnucash\">GnuCash</span> is Free Software and is made available free of charge. Your donation, which is purely optional, supports our worldwide community. If you like the software, please consider a donation. We are only a handfull of developers and other volunteers serving countless users worldwide.");
   include ("emulate_globals_on.php");
   include ("externals/header.phtml");
   include ("externals/menu.phtml");
@@ -8,9 +9,9 @@
 
 <div id="content">
 
-  <h1><?=T_("Donations")?></h1>
+  <h1><?=$title?></h1>
 
-  <p class="justify"><?=T_("<span class=\"gnucash\">GnuCash</span> is Free Software and is made available free of charge. Your donation, which is purely optional, supports our worldwide community. If you like the software, please consider a donation. We are only a handfull of developers and other volunteers serving countless users worldwide.")?></p>
+  <p class="justify"><?=$description?></p>
 
 
   <div class="featurecontainer">
diff --git a/download.phtml b/download.phtml
index c834e6a..d2f7348 100644
--- a/download.phtml
+++ b/download.phtml
@@ -3,6 +3,7 @@
   include("emulate_globals_on.php");
   include("lang.php");
   $title = T_("Download");
+  $description = T_("Download executable bundles of the <span class=\"gnucash\">GnuCash</span> program inclusive documentation or the source files here. Several versions are available for recent and older operating systems.");
   include("externals/header.phtml");
   include("externals/menu.phtml"); 
 ?>
@@ -10,6 +11,7 @@
 <div id="content">
 
   <h1><?php echo T_("Download GnuCash")?></h1>
+    <p class="justify"><?=$description?></p>
 
   <div class="featureborder">
     <h2 class="featuretitle"><?php printf (T_("Stable release (%s)"), $latest_stable)?></h2>
diff --git a/features.phtml b/features.phtml
index 3fa0965..8f0a656 100644
--- a/features.phtml
+++ b/features.phtml
@@ -1,18 +1,17 @@
 <?php
 include("lang.php");
 $title = T_("Features");
+$description = T_("<span class=\"gnucash\">GnuCash</span> is powerful accounting software. Below are details of some of the numerous features that <span class=\"gnucash\">GnuCash</span> has to offer to its users.");
 include("emulate_globals_on.php");
 include("$top_dir/externals/header.phtml");
 include("$top_dir/externals/menu.phtml");
 ?>
 
 <div id="content">
-<h1><?php echo T_($title);?></h1>
+<h1><?=$title?></h1>
 
 <div>
-<p>
-<?php echo T_("<span class=\"gnucash\">GnuCash</span> is powerful accounting software. Below are details of some of the numerous features that <span class=\"gnucash\">GnuCash</span> has to offer to its users.");?>
-</p>
+<p><?=$description?></p>
 <ul>
 <li><a href="#main-feat"><?php echo T_("Main features");?></a></li>
 <li><a href="#advan-feat"><?php echo T_("Advanced features");?></a></li>
diff --git a/new_features-4.0.phtml b/new_features-4.0.phtml
index 7f838b1..415fb5e 100644
--- a/new_features-4.0.phtml
+++ b/new_features-4.0.phtml
@@ -1,13 +1,14 @@
 <?php
 include("lang.php");
-$title = T_("Features");
+$title = T_("Features");;
+$description = sprintf (T_("What's New in GnuCash %s"),"4.0");
 include("emulate_globals_on.php");
 include("$top_dir/externals/header.phtml");
 include("$top_dir/externals/menu.phtml");
 ?>
 
 <div id="content">
-    <h1><?php printf (T_("What's New in GnuCash %s"),"4.0");?></h1>
+    <h1><?$description?></h1>
 
     <div class="featurecontainer">
         <div class="featureborder">
@@ -17,13 +18,13 @@ include("$top_dir/externals/menu.phtml");
             <img class="featureimage"
                  src="<?=$top_dir?>/images/4.0-release/trans-assoc.png"
                  alt="[Transaction Association Dialog]"/>
-            <p class="justify">
+            <div class="center">
                 <ul>
                     <li><?php echo T_("A new <b>Transaction Association</b> dialog, available from the <b>Update Association for Transaction</b> menu item that has replaced the two association items in 3.x, allows setting, changing, and deleting associations.");?></li>
                     <li><?php echo T_("A symbol (paperclip for files, chain links for URLS) is now displayed in the Associations column (visible in double-line mode) in the register in place of the letters when a transaction has an association. This doesn't work on MacOS.");?></li>
                     <li><?php echo T_("Associations may now be added to bills, credit notes, invoices, and vouchers. The actual association when present is added as a link button which is shown below the notes.");?> </li>
                 </ul>
-            </p>
+            </div>
         </div>
         <div class="row">
             <video class="featureimage" controls>
diff --git a/news.phtml b/news.phtml
index b00b853..307aa45 100644
--- a/news.phtml
+++ b/news.phtml
@@ -2,6 +2,7 @@
 include("emulate_globals_on.php");
 include("lang.php");
 $title = T_("News");
+$description = T_("Announcement of New Releases, Server Maintenance,…");
 include("externals/header.phtml");
 include("externals/menu.phtml");
 ?>
@@ -9,7 +10,9 @@ include("externals/menu.phtml");
 <div id="content">
   <div id="newscontainer">
     <h1><?php echo T_("GnuCash News"); ?></h1>
+    <p><?=$description?></p>
     <?php
+    if (!isset($top_dir)) { $top_dir = $GLOBALS["top_dir"]; }
       echo("<!-- top_dir = $top_dir , home = $home -->\n");
       # News will continue to be translated separately because 
       # of the .txt format. 
diff --git a/oldnews.phtml b/oldnews.phtml
index 53cb59f..4b404a5 100644
--- a/oldnews.phtml
+++ b/oldnews.phtml
@@ -1,17 +1,18 @@
 <?php 
 include("emulate_globals_on.php");
 include("lang.php");
-$title = T_("Free Accounting Software");
+$title = T_("Older Announcements");
+$description = T_("This is an archive of announcements that once appeared on the GnuCash home page.");
 include("externals/header.phtml");
 include("externals/menu.phtml");
 ?>
 
 <div id="content">
 
-<h1><?php echo T_("Older Announcements");?></h1>
+<h1><?=$title?></h1>
 
 <p>
-<?php echo T_("This is an archive of announcements that once appeared on the GnuCash home page.");?>
+<?=$description?>
 </p>
 
 <?php
diff --git a/sizing.phtml b/sizing.phtml
index 411eb95..c514727 100644
--- a/sizing.phtml
+++ b/sizing.phtml
@@ -1,6 +1,7 @@
 <?php
 include("lang.php");
 $title = T_("Sizing");
+$description = T_("This is a very old page about Gnucash's code size.");
 include("emulate_globals_on.php");
 include("externals/header.phtml");
 include("externals/menu.phtml");
@@ -8,7 +9,8 @@ include("externals/menu.phtml");
 
 <div id="content">
 
-<h1><?php echo T_($title);?></h1>
+<h1><?=$title?></h1>
+<p><?=$description?></p>
 
 <p class="justify">
 <?php echo T_("It can often be quite interesting to study the source code metrics behind a software development project.   Not a surprising interest: its accounting afterall. <span class=\"gnucash\">GnuCash</span> has grown, over the years, from a small handy electronic checkbook to a rather large and multi-featured desktop app.");?>



Summary of changes:
 2.6-release-tour.phtml                  |   8 +++-----
 develdocs.phtml                         |   3 ++-
 docs.phtml                              |   5 +++--
 donate.phtml                            |   5 +++--
 download.phtml                          |   2 ++
 features.phtml                          |   7 +++----
 locale/de/LC_MESSAGES/gnucash-htdocs.mo | Bin 91601 -> 91601 bytes
 new_features-4.0.phtml                  |   9 +++++----
 news.phtml                              |   3 +++
 news/160628-2.6.13.news                 |  12 ++++++------
 news/191229-3.8.news                    |   2 +-
 news/news-script.php                    |   3 ++-
 oldnews.phtml                           |   7 ++++---
 po/de.po                                |   2 +-
 sizing.phtml                            |   4 +++-
 15 files changed, 41 insertions(+), 31 deletions(-)



More information about the gnucash-changes mailing list