diff --git a/checkin_notes b/checkin_notes index 8ba5edd627..e2ea9ea8a5 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1329,3 +1329,11 @@ David 18 Feb 2010 app.cpp cs_prefs.cpp log_flags.cpp + +David 19 Feb 2010 + - web: translation stuff + html/ + inc/ + result.inc + user/ + prefs.php diff --git a/html/inc/result.inc b/html/inc/result.inc index bacca9d9bf..0c22eb5f33 100644 --- a/html/inc/result.inc +++ b/html/inc/result.inc @@ -177,7 +177,7 @@ function result_client_state_string($result) { switch($result->client_state) { case 0: return tra("New"); case 1: return tra("Downloading"); - case 2: return tra("Computing"); + case 2: return tra("Processing"); case 3: return tra("Compute error"); case 4: return tra("Uploading"); case 5: return tra("Done"); diff --git a/html/ops/build_po_boinc.php b/html/ops/build_po_boinc.php index 23bfc93bdc..e9ad2c870f 100755 --- a/html/ops/build_po_boinc.php +++ b/html/ops/build_po_boinc.php @@ -51,6 +51,8 @@ stream_copy_to_stream($pipe, $out); fclose($pipe); fclose($out); -echo "Done. Move en.po to boinc/locale/templates/BOINC-Project-Generic.pot\n"; +system("mv en.po ../../locale/templates/BOINC-Project-Generic.pot\n"); + +echo "Done\n"; ?> diff --git a/html/user/prefs.php b/html/user/prefs.php index 7396dff62d..d6fae04a35 100644 --- a/html/user/prefs.php +++ b/html/user/prefs.php @@ -30,7 +30,7 @@ $subset = get_str("subset"); $columns = get_int("cols", true); $updated = get_int("updated", true); -page_head(subset_name($subset)." ".tra("preferences")); +page_head(tra("%1 preferences", subset_name($subset))); if (isset($updated)) { echo "

".tra("Your preferences have been updated. Client-related preferences diff --git a/locale/templates/BOINC-Project-Generic.pot b/locale/templates/BOINC-Project-Generic.pot index 42c5f26fbc..1f3f417891 100644 --- a/locale/templates/BOINC-Project-Generic.pot +++ b/locale/templates/BOINC-Project-Generic.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: BOINC $Id$\n" "Report-Msgid-Bugs-To: BOINC translation team \n" -"POT-Creation-Date: 2010-02-17 13:11 PST\n" +"POT-Creation-Date: 2010-02-19 09:49 PST\n" "Last-Translator: Generated automatically from source files\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -833,7 +833,7 @@ msgstr "" msgid "Should %1 show your computers on its web site?" msgstr "" -#: ../inc/prefs.inc:933 ../inc/result.inc:180 +#: ../inc/prefs.inc:933 msgid "Computing" msgstr "" @@ -1112,6 +1112,10 @@ msgstr "" msgid "Downloading" msgstr "" +#: ../inc/result.inc:180 +msgid "Processing" +msgstr "" + #: ../inc/result.inc:181 msgid "Compute error" msgstr "" @@ -1675,7 +1679,7 @@ msgstr "" msgid "Preferences for this project" msgstr "" -#: ../inc/user.inc:228 +#: ../inc/user.inc:228 ../user/prefs.php:33 msgid "%1 preferences" msgstr "" @@ -2726,10 +2730,6 @@ msgstr "" msgid "To unblock, visit %1message board preferences%2" msgstr "" -#: ../user/prefs.php:33 -msgid "preferences" -msgstr "" - #: ../user/prefs.php:36 msgid "" "Your preferences have been updated. Client-related preferences\n"