r18459 - htdocs/trunk - Some translation related changes

Geert Janssens gjanssens at code.gnucash.org
Thu Dec 3 15:49:56 EST 2009


Author: gjanssens
Date: 2009-12-03 15:49:56 -0500 (Thu, 03 Dec 2009)
New Revision: 18459
Trac: http://svn.gnucash.org/trac/changeset/18459

Modified:
   htdocs/trunk/docs.phtml
   htdocs/trunk/download.phtml
   htdocs/trunk/externals/menu.phtml
   htdocs/trunk/index.phtml
   htdocs/trunk/sizing.phtml
Log:
Some translation related changes

* 'un-gettextize' strings that shouldn't be translated
* use printf instead of echo if the strings contain (php)variables
* gettextize strings that should be translated

Modified: htdocs/trunk/docs.phtml
===================================================================
--- htdocs/trunk/docs.phtml	2009-12-03 19:09:57 UTC (rev 18458)
+++ htdocs/trunk/docs.phtml	2009-12-03 20:49:56 UTC (rev 18459)
@@ -60,7 +60,7 @@
   <li><a href="http://code.neil.williamsleesmill.me.uk/otherdocs.html"><?php echo _("Neil Williams GnuCash documentation");?></a></li>
   <li><a href="http://www.aerospacesoftware.com/GNU_Cash_for_Business_users_Howto_Guide.html"><?php echo _("GnuCash for Business Users");?></a>
     (<a href="http://www.linas.org/mirrors/www.aerospacesoftware.com/2003.06.21/GNU_Cash_for_Business_users_Howto_Guide.html"><?php echo _("mirror");?></a>)</li>
-  <li><a href="http://www.ncsysadmin.org/july2001/ncsa-gnucash-talk.html"><?php
+  <li><a href="http://www.austintek.com/gnucash/ncsa-gnucash-talk.html"><?php
 	echo _("Joe Mack's Tutorial");?></a></li>
   <li><a href="http://www.object-refinery.com/gnucash/index.html"><?php
 	echo _("Dave Gilbert's User Guide (PDF)");?></a></li>

Modified: htdocs/trunk/download.phtml
===================================================================
--- htdocs/trunk/download.phtml	2009-12-03 19:09:57 UTC (rev 18458)
+++ htdocs/trunk/download.phtml	2009-12-03 20:49:56 UTC (rev 18459)
@@ -12,17 +12,17 @@
 
 <h1><?php echo _("Download GnuCash")?></h1>
 
-<h2><?php echo _("Stable release ($latest_stable)")?></h2>
+<h2><?php printf (_("Stable release (%s)"), $latest_stable)?></h2>
 <p><?php echo _("A stable release is a version of GnuCash that is well tested and considered appropriate for every day use.")?></p>
-<p><?php echo _("The latest stable release of GnuCash is $latest_stable.  Choose the download for your operating system below.")?></p>
+<p><?php printf (_("The latest stable release of GnuCash is %s.  Choose the download for your operating system below."), $latest_stable)?></p>
 
 <h3><?php echo _("Installers")?></h3>
 <ul>
-<li><?php echo _("GnuCash $latest_stable for")?> <a href="<?php echo $download_path.$latest_stable_win;?>">Microsoft Windows XP/Vista</a></li>
-<li><?php echo _("GnuCash $latest_stable for")?> Mac OS X <a href="<?php echo $download_path.$latest_stable_mac_intel;?>">Intel</a> | <a href="<?php echo $download_path.$latest_stable_mac_ppc;?>">Power PC</a> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $latest_stable;?>/Readme">Readme</a></li>
+<li><?php printf (_("GnuCash %s for"), $latest_stable)?> <a href="<?php echo $download_path.$latest_stable_win;?>">Microsoft Windows XP/Vista</a></li>
+<li><?php printf (_("GnuCash %s for"), $latest_stable)?> Mac OS X <a href="<?php echo $download_path.$latest_stable_mac_intel;?>">Intel</a> | <a href="<?php echo $download_path.$latest_stable_mac_ppc;?>">Power PC</a> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $latest_stable;?>/Readme">Readme</a></li>
 </ul>
 
-<a name="distribution"></a><h3><?php echo _("Linux")?></h3>
+<a name="distribution"></a><h3>Linux</h3>
 <p><?php echo _("Most linux distributions come bundled with a version of GnuCash, though it's not always the most recent version and it may not have been installed by default. Still it is recommended to use the GnuCash version that comes with your distribution.");?></p>
 <p><?php echo "Below are ways to install GnuCash on some of the more popular distributions:";?></p>
 
@@ -35,26 +35,26 @@
 
 <h3><?php echo _("Source code")?></h3>
 <ul>
-  <li><a href="<?php echo $download_path.$latest_stable_source;?>">bzip2 compressed tarball</a> <?php echo _("for GnuCash $latest_stable")?></li>
+  <li><a href="<?php echo $download_path.$latest_stable_source;?>">bzip2 compressed tarball</a> <?php printf (_("for GnuCash %s"), $latest_stable)?></li>
   <li><a href="http://www.gnucash.org/pub/gnucash/sources/stable/<?php echo $latest_stable_source;?>"><?= _("USA Mirror");?></a></li>
   <li><a href="http://ftp.at.gnucash.org/pub/gnucash/gnucash/sources/stable/<?php echo $latest_stable_source;?>"><?= _("European Mirror");?></a></li>
  </ul>
 
-<h2><?php echo _("Unstable/Development release ($latest_unstable)")?></h2>
+<h2><?php printf (_("Unstable/Development release (%s)"), $latest_unstable)?></h2>
 <p><?php echo _("Unstable (development) releases are for testing purposes only. They contain the newest features and improvements, but may also contain serious bugs still. Don't install these releases for everyday use.")?></p>
-<p><?php echo _("The latest unstable release of GnuCash is $latest_unstable.  Choose the download for your operating system below.")?></p>
+<p><?php printf (_("The latest unstable release of GnuCash is %s.  Choose the download for your operating system below."), $latest_unstable)?></p>
 
 <ul>
-  <li><?php echo _("GnuCash $latest_unstable for")?> <a href="<?php echo $download_path.$latest_unstable_win;?>">Microsoft Windows XP/Vista</a></li>
-  <li><?php echo _("GnuCash $latest_unstable for")?> Mac OS X <a href="<?php echo $download_path.$latest_unstable_mac_intel;?>">Intel</a> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $latest_unstable;?>/Readme">Readme</a></li>
-  <li><a href="<?php echo $download_path.$latest_unstable_source;?>">bzip2 compressed tarball</a> <?php echo _("for GnuCash $latest_unstable")?></li>
+  <li><?php printf (_("GnuCash %s for"), $latest_unstable)?> <a href="<?php echo $download_path.$latest_unstable_win;?>">Microsoft Windows XP/Vista</a></li>
+  <li><?php printf (_("GnuCash %s for"), $latest_unstable)?> Mac OS X <a href="<?php echo $download_path.$latest_unstable_mac_intel;?>">Intel</a> | <a href="http://wiki.gnucash.org/wiki/MacOSX/<?php echo $latest_unstable;?>/Readme">Readme</a></li>
+  <li><a href="<?php echo $download_path.$latest_unstable_source;?>">bzip2 compressed tarball</a> <?php printf (_("for GnuCash %s"), $latest_unstable)?></li>
 </ul>
 
 <h2><?php echo _("Other")?></h2>
 
 <ul>
- <li><a href="<?php echo $latest_stable_path;?>"><?php echo _("View all GnuCash $latest_stable downloads (stable)")?></a></li>
- <li><a href="<?php echo $latest_unstable_path;?>"><?php echo _("View all GnuCash $latest_unstable downloads (unstable)")?></a></li>
+ <li><a href="<?php echo $latest_stable_path;?>"><?php printf (_("View all GnuCash %s downloads (stable)"), $latest_stable)?></a></li>
+ <li><a href="<?php echo $latest_unstable_path;?>"><?php printf (_("View all GnuCash %s downloads (unstable)"), $latest_unstable)?></a></li>
  <li><a href="http://sourceforge.net/projects/gnucash/files/"><?php echo _("View all GnuCash downloads")?></a></li>
 </ul>
 

Modified: htdocs/trunk/externals/menu.phtml
===================================================================
--- htdocs/trunk/externals/menu.phtml	2009-12-03 19:09:57 UTC (rev 18458)
+++ htdocs/trunk/externals/menu.phtml	2009-12-03 20:49:56 UTC (rev 18459)
@@ -12,7 +12,7 @@
   </span>
   <ul>
     <li><a href="<?=$home?>/index.phtml"><?= _("About / News")?></a></li>
-    <li><a href="<?=$home?>/atom.php"><img src="<?=$top_dir?>/externals/feed-icon-12x12.png" width="12" height="12" alt="[atom feed]" /> News Feed</a></li>
+    <li><a href="<?=$home?>/atom.php"><img src="<?=$top_dir?>/externals/feed-icon-12x12.png" width="12" height="12" alt="[atom feed]" /> <?= _("News Feed")?></a></li>
     <li><a href="<?=$home?>/features.phtml"><?=_("Screenshots, Features")?></a></li>
     <li><a href="http://wiki.gnucash.org/wiki/Development"><?= _("How to help")?></a></li>
   </ul>

Modified: htdocs/trunk/index.phtml
===================================================================
--- htdocs/trunk/index.phtml	2009-12-03 19:09:57 UTC (rev 18458)
+++ htdocs/trunk/index.phtml	2009-12-03 20:49:56 UTC (rev 18459)
@@ -13,7 +13,7 @@
 <h1><?php echo _("Welcome to GnuCash.org")?></h1>
 
 <div id="download">
-<h2><?php echo _("Download GnuCash $latest_stable")?></h2>
+<h2><?php printf (_("Download GnuCash %s"), $latest_stable)?></h2>
 
 <ul>
 <li><img src="<?=$top_dir?>/images/icons/linux.png" /> Linux <a href="<?php echo $download_path.$latest_stable_source;?>"><?php echo _("Source");?></a> | <a href="<?=$home?>/download.phtml#distribution"><?php echo _("Via distribution");?></a></li>

Modified: htdocs/trunk/sizing.phtml
===================================================================
--- htdocs/trunk/sizing.phtml	2009-12-03 19:09:57 UTC (rev 18458)
+++ htdocs/trunk/sizing.phtml	2009-12-03 20:49:56 UTC (rev 18459)
@@ -41,19 +41,19 @@
 <THEAD>
 <TR
 ><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("Version");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("engine");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("backend");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("register");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("ledger");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("motif");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("gnome");?></TH
+><TH ALIGN="LEFT" VALIGN="TOP">engine</TH
+><TH ALIGN="LEFT" VALIGN="TOP">backend</TH
+><TH ALIGN="LEFT" VALIGN="TOP">register</TH
+><TH ALIGN="LEFT" VALIGN="TOP">ledger</TH
+><TH ALIGN="LEFT" VALIGN="TOP">motif</TH
+><TH ALIGN="LEFT" VALIGN="TOP">gnome</TH
 ><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("misc app");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("import export");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("reports");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("scheme (misc)");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("business");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("test");?></TH
-><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("user docs");?></TH
+><TH ALIGN="LEFT" VALIGN="TOP">import-export</TH
+><TH ALIGN="LEFT" VALIGN="TOP">reports</TH
+><TH ALIGN="LEFT" VALIGN="TOP">scheme</TH
+><TH ALIGN="LEFT" VALIGN="TOP">business</TH
+><TH ALIGN="LEFT" VALIGN="TOP">test</TH
+><TH ALIGN="LEFT" VALIGN="TOP">docs</TH
 ><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("internal txt");?></TH
 ><TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("Total");?></TH>
 <TH ALIGN="LEFT" VALIGN="TOP"><?php echo _("Languages");?></TH >
@@ -327,15 +327,15 @@
 <b><?php echo _("Table Column Legend");?></b><br><br>
     <P></P>
  <DL>
-    <DT><B><?php echo _("engine");?></B></DT>
+    <DT><B>engine</B></DT>
     <DD><?php echo _("Contents of the src/engine and the include directories. The engine was split out from the motif code in version 1.1. The data storage backend (file-io, sql) was split out in the course of version 1.5");?>
 	<P></P>
         </DD>
-    <DT><B><?php echo _("backend");?></B></DT>
+    <DT><B>backend</B></DT>
     <DD><?php echo _("Contents of the src/backend directory (version 1.7 and later) or of src/engine/file, src/engine/sql (version 1.6 and earlier)");?>
 	<P></P>
         </DD>
-    <DT><B><?php echo _("register");?></B></DT>
+    <DT><B>register</B></DT>
     <DD><?php echo _("Contents of the src/register directory (version 1.6 and earlier) or src/register/register-core (version 1.7 and later).  The register was split out as a separate component from the motif code in version 1.1. As can be seen from the stats, the register code has been fairly stable. At version 1.7 and later, this cell shows a second count: the number of lines of code in src/register/register-gnome (previously counted as part of gnome)");?>
 	<P></P>
         </DD>
@@ -343,11 +343,11 @@
     <DD><?php echo _("*.c, *.h files in the src directory only (version 1.6 and earlier) or src/register/ledger-core (version 1.7 and later)");?>
 	<P></P>
     </DD>
-    <DT><B><?php echo _("motif");?></B></DT>
+    <DT><B>motif</B></DT>
     <DD><?php echo _("Contents of the src/motif directory (version 1.2 and earlier).  The motif version of the code was discontinued after version 1.2, after most of the non-gui code was moved to either the engine, the register or the ledger.");?>
 	<P></P>
     </DD>
-    <DT><B><?php echo _("gnome");?></B></DT>
+    <DT><B>gnome</B></DT>
     <DD><?php echo _("Contents of src/gnome plus src/register/gnome (version 1.6 and earlier). For version 1.7 and later, this consists of src/gnome, src/gnome-search and src/gnome-util");?>
 	<P></P>
     </DD>
@@ -357,17 +357,17 @@
 	<P></P>
     </DD>
 
-    <DT><B><?php echo _("import export");?></B></DT>
+    <DT><B>import-export</B></DT>
     <DD><?php echo _("Code to import and export various file formats: contents of the src/import-export directory.");?>
 	<P></P>
      </DD>
 
-    <DT><B><?php echo _("reports");?></B></DT>
+    <DT><B>reports</B></DT>
     <DD><?php echo _("Code to generate reports and graphs: contents of the src/reports directory.");?>
 	<P></P>
      </DD>
 
-    <DT><B><?php echo _("scheme");?></B></DT>
+    <DT><B>scheme</B></DT>
     <DD><?php echo _("scheme and guile code in directories src/scm plus src/guile (version 1.6 and earlier). In version 1.7 and later, much of this code went into reports, import/export, and into indiovidual modules; thus only miscellaneous code remains.");?>
 	<P></P>
     </DD>
@@ -377,12 +377,12 @@
 	<P></P>
      </DD>
 
-    <DT><B><?php echo _("test");?></B></DT>
+    <DT><B>test</B></DT>
     <DD><?php echo _("Code to peform automated regression tests: contents of the src/*/test directories.");?>
 	<P></P>
      </DD>
 
-    <DT><B><?php echo _("docs");?></B></DT>
+    <DT><B>docs</B></DT>
     <DD><?php echo _("English-language-only user documentation, including on-line help and manual (html, sgml or xml). For version 1.8.4 and later, the number below the bar counts the translated, non-english docs (currently de, es, fr, pt_PT).  Both of these numbers are somewhat hard to count, because of fairly large format churns, and multiple competing versions.");?>
 	<P></P>
     </DD>



More information about the gnucash-changes mailing list