From 3940c73ebfb6fb20194fc8877e7251e15645edf5 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 29 Dec 2006 21:42:14 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11740
---
 checkin_notes                |   9 ++-
 doc/help.php                 |  49 ++++------------
 doc/index.php                |  33 ++++-------
 languages/translations/en.po | 107 ++++++++++++++++++++++++++++++++++-
 4 files changed, 136 insertions(+), 62 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 83b451581b..f0ea87bb3b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -13822,4 +13822,11 @@ Rytis  29 Dec 2006
         user/
             forum_edit.php
             forum_rate.php
-            forum_thread.php
\ No newline at end of file
+            forum_thread.php
+
+David  29 Dec 2006
+    - web site: made the help page and the "Volunteer" part
+        of the front page translatable.
+
+    languages/
+        translations/en.po
diff --git a/doc/help.php b/doc/help.php
index a832a33abc..0bc5d37ce1 100644
--- a/doc/help.php
+++ b/doc/help.php
@@ -2,37 +2,22 @@
 require_once("docutil.php");
 require_once("spoken_languages.php");
 require_once("help_db.php");
+require_once("../html/inc/translation.inc");
 
-page_head("BOINC Online Help");
+page_head(tr(HELP_TITLE));
 
 echo "
-<h2>Need help?</h2>
+<h2>".tr(HELP_HEADING1)."</h2>
 <p>
-BOINC Online Help lets you talk one-on-one
-with experienced BOINC users, who can:
-<ul>
-<li> answer questions about BOINC and volunteer computing;
-<li> walk you through the process of installing and using BOINC;
-<li> troubleshoot any problems you might have.
+".sprintf(tr(HELP_P1_1), "<ul>", "<li>", "<li>", "<li>")."
 </ul>
 <p>
-BOINC Online Help is based on
-<a href=http://www.skype.com>Skype</a>,
-an Internet-based telephone system.
-Skype is free (both the software and the calls).
-If you don't already have Skype, please
-<a href=http://www.skype.com>download and install it now</a>.
-When you're finished, return to this page.
+".sprintf(tr(HELP_P1_2), "<a href=http://www.skype.com>", "</a>", "<a href=http://www.skype.com>", "</a>")."
 <p>
-The best way to get help is by voice,
-for which you need either built-in microphone and speakers
-or an external headset for your computer.
-Alternatively, you can use Skype's text-based chat system
-to communicate with Help Volunteers.
+".tr(HELP_P1_3),"
 
 <p>
-Volunteers speaking several languages are available.
-Please select a language:
+".tr(HELP_P1_4),"
 <p>
 ";
 
@@ -48,25 +33,15 @@ foreach ($langs as $lang) {
     echo "<a href=help_lang.php?lang=$lang_enc><b>$lang</b></a>";
 }
 echo "
-<h2>Other sources of help</h2>
+<h2>".tr(HELP_HEADING2)."</h2>
 <p>
-You can also get information and advice from:
-<ul>
-<li> <a href=http://boinc.berkeley.edu/>The BOINC web site</a>.
-<li> <a href=http://boinc.berkeley.edu/links.php>BOINC-related web sites</a>.
-<li> <a href=http://boinc.berkeley.edu/dev/>The BOINC message boards</a>.
-<li> The message boards on any BOINC-based project.
+".sprintf(tr(HELP_P2_1), "<ul><li> <a href=http://boinc.berkeley.edu/>", "</a>", "<li> <a href=http://boinc.berkeley.edu/links.php>", "</a>", "<li> <a href=http://boinc.berkeley.edu/dev/>", "</a>", "<li>")."
 </ul>
-<h2>Be a Help Volunteer</h2>
+<h2>".tr(HELP_HEADING3)."</h2>
 <p>
-If you are an experienced BOINC user, we encourage you to
-<a href=help_volunteer.php>become a Help Volunteer</a>.
-It's a great way to help the cause of scientific research
-and volunteer computing -
-and it's fun!
+".sprintf(tr(HELP_P3_1), "<a href=help_volunteer.php>", "</a>")."
 <p>
-If you're already a Help Volunteer: to edit your settings,
-<a href=help_vol_edit.php?edit_login=1>click here</a>.
+".sprintf(tr(HELP_P3_2), "<a href=help_vol_edit.php?edit_login=1>", "</a>")."
 ";
 page_tail();
 ?>
diff --git a/doc/index.php b/doc/index.php
index 946f161942..5a7ac259cb 100644
--- a/doc/index.php
+++ b/doc/index.php
@@ -1,5 +1,7 @@
 <?php
 require_once("docutil.php");
+require_once("../html/inc/translation.inc");
+
 
 function show_participant() {
     global $light_blue;
@@ -53,35 +55,22 @@ function show_participate() {
     global $light_blue;
     echo "
         <tr><td bgcolor=$light_blue>
-            <font size=4>&nbsp;Volunteer</font>
+            <font size=4>&nbsp;".tr(HOME_HEADING1)."</font>
         </td></tr>
         <tr><td>
         <p>
-        Use the idle time on your computer
-        (Windows, Mac, or Linux)
-        to cure diseases, study global warming,
-        discover pulsars,
-        and do many other types of scientific research.
-        It's safe, secure, and easy:
-        <ol>
-        <li> <a href=projects.php><font size=+1>Choose</font></a> projects
-        <li> <a href=download.php><font size=+1>Download</font></a> and run BOINC software
-        <li> <font size=+1>Enter</font> the project URLs, your email address, and password.
+        ".sprintf(tr(HOME_P1), "<ol> <li> <a href=projects.php><font size=+1>", "</font></a>", "<li> <a href=download.php><font size=+1>", "</font></a>", "<li> <font size=+1>", "</font>")."
         </ol>
         <p>
-        Alternatively, if you run several projects, it may be easier to
-        use an <a href=acct_mgrs.php>account manager</a>
-        such as <a href=http://gridrepublic.org>GridRepublic</a>
-        or <a href=http://bam.boincstats.com/>BAM!</a>.
+        ".sprintf(tr(HOME_P2), "<a href=acct_mgrs.php>", "</a>", "<a href=http://gridrepublic.org>", "</a>", "<a href=http://bam.boincstats.com/>", "</a>")."
         <p>
-        If you have any questions, or need help getting started, you can
-        <a href=help.php>talk to a Volunteer Helper</a>.
+        ".sprintf(tr(HOME_P3), "<a href=help.php>", "</a>")."
         <center>
-        <a href=participate.php><b><nobr>More info</nobr></b></a> 
-        | <a href=download.php><b>Download</b></a>
-        | <a href=links.php><b><nobr>Web sites</nobr></b></a>
-        | <a href=addons.php><b>Add-ons</b></a>
-        | <a href=poll.php><b><nobr>Survey</nobr></b></a>
+        <a href=participate.php><b><nobr>".tr(HOME_MORE_INFO)."</nobr></b></a> 
+        | <a href=download.php><b>".tr(HOME_DOWNLOAD)."</b></a>
+        | <a href=links.php><b><nobr>".tr(HOME_WEB_SITES)."</nobr></b></a>
+        | <a href=addons.php><b>".tr(HOME_ADD_ONS)."</b></a>
+        | <a href=poll.php><b><nobr>".tr(HOME_SURVEY)."</nobr></b></a>
         </center>
         </td></tr>
     ";
diff --git a/languages/translations/en.po b/languages/translations/en.po
index a4cd14b8a9..addcbc4de3 100644
--- a/languages/translations/en.po
+++ b/languages/translations/en.po
@@ -16,7 +16,10 @@ msgstr "English"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "English"
 
-# for user survey
+########################################
+# poll-related stuff
+########################################
+
 msgid "POLL_TITLE"
 msgstr "BOINC user survey"
 
@@ -586,4 +589,104 @@ msgstr "If project-specific problems persist, "
 
 msgid "RLN_TROUBLESHOOT_BOINC_ITSELF"
 msgstr "If you have problems with BOINC itself, "
-    "get help from the %s BOINC message boards %s."
\ No newline at end of file
+    "get help from the %s BOINC message boards %s."
+
+##############################################
+# help.php
+##############################################
+msgid "HELP_TITLE"
+msgstr "Getting help with BOINC"
+
+msgid "HELP_HEADING1"
+msgstr "Online Help"
+
+msgid "HELP_P1_1"
+msgstr "BOINC Online Help lets you talk one-on-one "
+    "with experienced BOINC users, who can: "
+    "%s answer questions about BOINC and volunteer computing; "
+    "%s walk you through the process of installing and using BOINC; "
+    "%s troubleshoot any problems you might have. "
+
+msgid "HELP_P1_2"
+msgstr "BOINC Online Help is based on "
+    "%sSkype%s, "
+    "an Internet-based telephone system. "
+    "Skype is free (both the software and the calls). "
+    "If you don't already have Skype, please "
+    "%sdownload and install it now%s. "
+    "When you're finished, return to this page. "
+
+msgid "HELP_P1_3"
+msgstr "The best way to get help is by voice, "
+    "for which you need either built-in microphone and speakers "
+    "or an external headset for your computer. "
+    "Alternatively, you can use Skype's text-based chat system "
+    "to communicate with Help Volunteers."
+
+msgid "HELP_P1_4"
+msgstr "Volunteers speaking several languages are available. "
+    "Please select a language: "
+
+msgid "HELP_HEADING2"
+msgstr "Other sources of help"
+
+msgid "HELP_P2_1"
+msgstr "You can also get information and advice from: "
+    "%sThe BOINC web site%s. "
+    "%sBOINC-related web sites%s. "
+    "%sThe BOINC message boards%s. "
+    "%sThe message boards on any BOINC-based project. "
+
+msgid "HELP_HEADING3"
+msgstr "Be a Help Volunteer"
+
+msgid "HELP_P3_1"
+msgstr "If you're an experienced BOINC user, we encourage you to "
+    "%sbecome a Help Volunteer%s. "
+    "It's a great way to help the cause of scientific research "
+    "and volunteer computing - "
+    "and it's fun!  "
+
+msgid "HELP_P3_2"
+msgstr "If you're already a Help Volunteer: to edit your settings, "
+    "%sclick here%s. "
+
+##############################################
+# index.php
+##############################################
+
+msgid "HOME_HEADING1"
+msgstr "Volunteer"
+
+msgid "HOME_P1"
+msgstr " Use the idle time on your computer "
+    " (Windows, Mac, or Linux) "
+    " to cure diseases, study global warming, "
+    " discover pulsars, and do many other types of scientific research. "
+    " It's safe, secure, and easy: "
+    " %sChoose%s projects "
+    " %sDownload%s and run BOINC software "
+    " %sEnter%s the project URLs, your email address, and password. "
+
+msgid "HOME_P2"
+msgstr "Alternatively, if you run several projects, it may be easier to "
+    "use an %saccount manager%s such as %sGridRepublic%s or %sBAM!%s. "
+
+msgid "HOME_P3"
+msgstr "If you have any questions, or need help getting started, you can "
+    "%stalk to a Volunteer Helper%s. "
+
+msgid "HOME_MORE_INFO"
+msgstr "More info"
+
+msgid "HOME_DOWNLOAD"
+msgstr "Download"
+
+msgid "HOME_WEB_SITES"
+msgstr "Web sites"
+
+msgid "HOME_ADD_ONS"
+msgstr "Add-ons"
+
+msgid "HOME_SURVEY"
+msgstr "Survey"