From 17c8f909265f03446942e93b55989ce30186e5ee Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 22 Aug 2013 16:33:08 -0700 Subject: [PATCH] BOINC web: fix translation problems - change build_po.php to included news.inc and omit poll stuff - remote.po.inc files before generating them (otherwise we'll always append) --- doc/build_po.php | 2 +- doc/poll_my_result.php.old | 26 ---- doc/update_translations.php | 5 +- html/inc/translation.inc | 2 - locale/templates/BOINC-Web.pot | 227 ++++++++++++++++++--------------- 5 files changed, 128 insertions(+), 134 deletions(-) delete mode 100644 doc/poll_my_result.php.old diff --git a/doc/build_po.php b/doc/build_po.php index 89feeebe55..29ebc30eba 100755 --- a/doc/build_po.php +++ b/doc/build_po.php @@ -34,7 +34,7 @@ HDR; $out = fopen("BOINC-Web.pot", "w"); fwrite($out, $header); -$pipe = popen("xgettext --omit-header -o - --keyword=tra -L PHP $path/*.inc $path/*.php", "r"); +$pipe = popen("xgettext --omit-header -o - --keyword=tra -L PHP *.inc *.php ../html/inc/news.inc", "r"); stream_copy_to_stream($pipe, $out); fclose($pipe); fclose($out); diff --git a/doc/poll_my_result.php.old b/doc/poll_my_result.php.old deleted file mode 100644 index ef6fba807d..0000000000 --- a/doc/poll_my_result.php.old +++ /dev/null @@ -1,26 +0,0 @@ -\n"; - echo " - $response->xml - - "; -} else { - echo "no response"; -} - -?> diff --git a/doc/update_translations.php b/doc/update_translations.php index 3a5ba01ac9..bb526e51a7 100755 --- a/doc/update_translations.php +++ b/doc/update_translations.php @@ -6,7 +6,10 @@ ini_set('display_startup_errors', true); require_once("../html/inc/translation.inc"); $lang_log_level = 0; -buildLanguages($lang_language_dir,$lang_translations_dir, $lang_compiled_dir); + +system("rm -f $lang_language_dir/$lang_compiled_dir/*"); + +buildLanguages($lang_language_dir, $lang_translations_dir, $lang_compiled_dir); echo "update_translations finished\n"; ?> diff --git a/html/inc/translation.inc b/html/inc/translation.inc index 2cf4e29ccf..2912770a20 100644 --- a/html/inc/translation.inc +++ b/html/inc/translation.inc @@ -49,10 +49,8 @@ function getSupportedLanguages(){ // @param langdir The language base directory // @param transdir The location of the .po files to compile relative to langdir // @param compdir The output location relative to langdir -// @param append If true the function will only append to rather than replace the compiled files // function buildLanguages($langdir,$transdir,$compdir){ - global $lang_project_default; // Run through each language and compile their lookup arrays. if (is_dir($langdir.$transdir)) { diff --git a/locale/templates/BOINC-Web.pot b/locale/templates/BOINC-Web.pot index 8086605263..1b47d12c2c 100644 --- a/locale/templates/BOINC-Web.pot +++ b/locale/templates/BOINC-Web.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: BOINC $Id$\n" "Report-Msgid-Bugs-To: BOINC translation team \n" -"POT-Creation-Date: 2013-06-05 10:25 PDT\n" +"POT-Creation-Date: 2013-08-22 16:22 PDT\n" "Last-Translator: Generated automatically from source files\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -60,8 +60,8 @@ msgstr "" msgid "Cognitive science and artifical intelligence" msgstr "" -#: projects.inc:50 projects.inc:318 projects.inc:362 projects.inc:411 -#: projects.inc:418 projects.inc:465 +#: projects.inc:50 projects.inc:342 projects.inc:386 projects.inc:435 +#: projects.inc:442 projects.inc:489 msgid "Private" msgstr "" @@ -131,15 +131,15 @@ msgid "" "of novel pharmaceuticals." msgstr "" -#: projects.inc:95 +#: projects.inc:103 msgid "Barcelona Biomedical Research Park (PRBB)" msgstr "" -#: projects.inc:96 +#: projects.inc:104 msgid "Molecular simulations of proteins" msgstr "" -#: projects.inc:97 +#: projects.inc:105 msgid "" "GPUGrid.net opens novel computational scenarios by the first full-atom " "molecular dynamics code (CellMD) specially optimized to run on NVIDIA GPUs. " @@ -147,31 +147,31 @@ msgid "" "computational biology for biomedical research." msgstr "" -#: projects.inc:103 +#: projects.inc:111 msgid "Technion, Israel" msgstr "" -#: projects.inc:104 +#: projects.inc:112 msgid "Genetic linkage analysis" msgstr "" -#: projects.inc:105 +#: projects.inc:113 msgid "" "Superlink@Technion helps geneticists all over the world find disease-" "provoking genes causing some types of diabetes, hypertension (high blood " "pressure), cancer, schizophrenia and many others." msgstr "" -#: projects.inc:119 +#: projects.inc:127 msgid "" "University of Maryland Center for Bioinformatics and Computational Biology" msgstr "" -#: projects.inc:120 +#: projects.inc:128 msgid "Life science research" msgstr "" -#: projects.inc:121 +#: projects.inc:129 msgid "" "The Lattice Project supplies computing power to scientists at the University " "of Maryland studying evolutionary relationships based on DNA sequence data; " @@ -179,15 +179,15 @@ msgid "" "nature reserves. " msgstr "" -#: projects.inc:127 +#: projects.inc:135 msgid "The Swiss Tropical Institute" msgstr "" -#: projects.inc:128 +#: projects.inc:136 msgid "Epidemiology" msgstr "" -#: projects.inc:129 +#: projects.inc:137 msgid "" "Simulation models of the transmission dynamics and health effects of malaria " "are an important tool for malaria control. They can be used to determine " @@ -198,15 +198,15 @@ msgid "" "social factors that influence the distribution of the disease. " msgstr "" -#: projects.inc:151 +#: projects.inc:159 msgid "University of Washington" msgstr "" -#: projects.inc:152 projects.inc:160 +#: projects.inc:160 projects.inc:168 msgid "Biology" msgstr "" -#: projects.inc:153 +#: projects.inc:161 msgid "" "Determine the 3-dimensional shapes of proteins in research that may " "ultimately lead to finding cures for some major human diseases. By running " @@ -216,30 +216,30 @@ msgid "" "Cancer, and Alzheimer's" msgstr "" -#: projects.inc:159 +#: projects.inc:167 msgid "University of Vienna" msgstr "" -#: projects.inc:161 +#: projects.inc:169 msgid "" "Calculate similarities between proteins. SIMAP provides a public database of " "the resulting data, which plays a key role in many bioinformatics research " "projects." msgstr "" -#: projects.inc:167 +#: projects.inc:175 msgid "Earth Sciences" msgstr "" -#: projects.inc:179 +#: projects.inc:187 msgid "Oxford University" msgstr "" -#: projects.inc:180 +#: projects.inc:188 msgid "Climate study" msgstr "" -#: projects.inc:181 +#: projects.inc:189 msgid "" "Investigate the approximations that have to be made in state-of-the-art " "climate models. By running the model thousands of times we hope to find out " @@ -251,19 +251,33 @@ msgid "" "century under a wide range of different scenarios." msgstr "" -#: projects.inc:188 +#: projects.inc:196 msgid "Astronomy, Physics, and Chemistry" msgstr "" -#: projects.inc:209 +#: projects.inc:202 projects.inc:241 projects.inc:249 +msgid "Astronomy" +msgstr "" + +#: projects.inc:203 +msgid "" +"We will combine the spectral coverage of GALEX, Pan-STARRS1, and WISE to " +"generate a multi-wavelength UV-optical-NIR galaxy atlas for the nearby " +"Universe. We will measure physical parameters (such as stellar mass surface " +"density, star formation rate surface density, attenuation, and first-order " +"star formation history) on a resolved pixel-by-pixel basis using spectral " +"energy distribution (SED) fitting techniques in a distributed computing mode." +msgstr "" + +#: projects.inc:225 msgid "University of Texas at Austin" msgstr "" -#: projects.inc:210 projects.inc:241 +#: projects.inc:226 projects.inc:257 msgid "Chemistry" msgstr "" -#: projects.inc:211 +#: projects.inc:227 msgid "" "A common problem in theoretical chemistry, condensed matter physics and " "materials science is the calculation of the time evolution of an atomic " @@ -276,37 +290,33 @@ msgid "" "interested in calculating the long time dynamics of systems." msgstr "" -#: projects.inc:224 +#: projects.inc:240 msgid "University of Illinois at Urbana-Champaign" msgstr "" -#: projects.inc:225 projects.inc:233 -msgid "Astronomy" -msgstr "" - -#: projects.inc:226 +#: projects.inc:242 msgid "" "The goal of Cosmology@Home is to search for the model that best describes " "our Universe and to find the range of models that agree with the available " "astronomical particle physics data." msgstr "" -#: projects.inc:232 +#: projects.inc:248 msgid "Rensselaer Polytechnic Institute" msgstr "" -#: projects.inc:234 +#: projects.inc:250 msgid "" "The goal of Milkyway@Home is to create a highly accurate three dimensional " "model of the Milky Way galaxy using data gathered by the Sloan Digital Sky " "Survey." msgstr "" -#: projects.inc:240 +#: projects.inc:256 msgid "Leiden University, The Netherlands" msgstr "" -#: projects.inc:242 +#: projects.inc:258 msgid "" "Surface science calculations using Classical Dynamics. Leiden Classical " "allows volunteers, students and other scientist to submit their personal " @@ -316,15 +326,15 @@ msgid "" "simulations through the grid." msgstr "" -#: projects.inc:256 +#: projects.inc:272 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute" msgstr "" -#: projects.inc:257 +#: projects.inc:273 msgid "Astrophysics" msgstr "" -#: projects.inc:258 +#: projects.inc:274 msgid "" "Search for spinning neutron stars (also called pulsars) using data from the " "LIGO and GEO gravitational wave detectors, and from the Arecibo radio " @@ -333,15 +343,15 @@ msgid "" "international organizations." msgstr "" -#: projects.inc:264 projects.inc:272 +#: projects.inc:288 projects.inc:296 msgid "CERN (European Organization for Nuclear Research)" msgstr "" -#: projects.inc:265 projects.inc:273 +#: projects.inc:289 projects.inc:297 msgid "Physics" msgstr "" -#: projects.inc:266 +#: projects.inc:290 msgid "" "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the " "European Organization for Nuclear Research, the world's largest particle " @@ -350,22 +360,22 @@ msgid "" "the design of LHC and its detectors." msgstr "" -#: projects.inc:274 +#: projects.inc:298 msgid "" "This project uses CERN-developed virtual machine technology for full-fledged " "LHC event physics simulation on volunteer computers. Requires that you " "install VirtualBox on your computer" msgstr "" -#: projects.inc:280 +#: projects.inc:304 msgid "University of California, Berkeley" msgstr "" -#: projects.inc:281 +#: projects.inc:305 msgid "Astrophysics, astrobiology" msgstr "" -#: projects.inc:282 +#: projects.inc:306 msgid "" "SETI (Search for Extraterrestrial Intelligence) is a scientific area whose " "goal is to detect intelligent life outside Earth. One approach, known as " @@ -374,15 +384,15 @@ msgid "" "detection would provide evidence of extraterrestrial technology." msgstr "" -#: projects.inc:296 +#: projects.inc:320 msgid "Bielefeld University of Applied Sciences" msgstr "" -#: projects.inc:297 +#: projects.inc:321 msgid "Chemical engineering and nanotechnology" msgstr "" -#: projects.inc:298 +#: projects.inc:322 msgid "" "The study of molecular magnets and controlled nanoscale magnetism. These " "magnetic molecules may be used to develop tiny magnetic switches, with " @@ -390,44 +400,44 @@ msgid "" "biotechnology." msgstr "" -#: projects.inc:305 +#: projects.inc:329 msgid "Multiple applications" msgstr "" -#: projects.inc:310 +#: projects.inc:334 msgid "Chinese Academy of Sciences" msgstr "" -#: projects.inc:311 +#: projects.inc:335 msgid "Physics, biochemistry, and others" msgstr "" -#: projects.inc:312 +#: projects.inc:336 msgid "" "The objective of CAS@home is to encourage and assist scientists in China to " "adopt the technologies of volunteer computing and volunteer thinking for " "their research." msgstr "" -#: projects.inc:319 +#: projects.inc:343 msgid "Mathematics, physics, evolution" msgstr "" -#: projects.inc:320 +#: projects.inc:344 msgid "" "Yoyo@home is an adapter between BOINC and several existing volunteer " "computing projects: ECM, Muon, Evolution@home, and distributed.net" msgstr "" -#: projects.inc:325 projects.inc:481 +#: projects.inc:349 projects.inc:505 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)" msgstr "" -#: projects.inc:326 +#: projects.inc:350 msgid "European research projects" msgstr "" -#: projects.inc:327 +#: projects.inc:351 msgid "" "The EDGeS@Home Beta project integrates volunteer computing into the service " "grid network of Europe by allowing service grids to send workunits to be " @@ -435,77 +445,78 @@ msgid "" "by the project include math, physics, biology, etc." msgstr "" -#: projects.inc:333 +#: projects.inc:357 msgid "Spanish universities and research centers" msgstr "" -#: projects.inc:334 +#: projects.inc:358 msgid "Various Spanish research projects" msgstr "" -#: projects.inc:335 +#: projects.inc:359 msgid "Research in physics, material science, and biomedicine" msgstr "" -#: projects.inc:341 -msgid "IBM Corporate Community Relations" +#: projects.inc:365 +msgid "IBM Corporate Citizenship" msgstr "" -#: projects.inc:342 -msgid "Humanitarian research on disease, natural disasters and hunger." +#: projects.inc:366 +msgid "Medical, environmental and other humanitarian research" msgstr "" -#: projects.inc:343 +#: projects.inc:367 msgid "" "To further critical non-profit research on some of humanity's most pressing " "problems by creating the world's largest volunteer computing grid. Research " -"includes HIV/AIDS, cancer, muscular dystrophy, dengue fever, and many more." +"includes HIV-AIDS, cancer, tropical and neglected diseases, solar energy, " +"clean water and many more." msgstr "" -#: projects.inc:349 +#: projects.inc:373 msgid "Mathematics, computing, and games" msgstr "" -#: projects.inc:355 +#: projects.inc:379 msgid "Computer Science" msgstr "" -#: projects.inc:363 +#: projects.inc:387 msgid "Mathematics, Physics, Artificial Intelligence" msgstr "" -#: projects.inc:364 +#: projects.inc:388 msgid "Simulation of quantum computing; Goldbach's conjecture." msgstr "" -#: projects.inc:404 projects.inc:412 projects.inc:466 +#: projects.inc:428 projects.inc:436 msgid "Cryptography" msgstr "" -#: projects.inc:413 +#: projects.inc:437 msgid "" "Attempt to decode 3 original Enigma messages. The signals were intercepted " "in the North Atlantic in 1942 and are believed to be unbroken." msgstr "" -#: projects.inc:419 projects.inc:458 projects.inc:474 projects.inc:482 -#: projects.inc:522 +#: projects.inc:443 projects.inc:482 projects.inc:490 projects.inc:498 +#: projects.inc:506 projects.inc:546 msgid "Mathematics" msgstr "" -#: projects.inc:420 +#: projects.inc:444 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics" msgstr "" -#: projects.inc:425 +#: projects.inc:449 msgid "California State University Fullerton" msgstr "" -#: projects.inc:426 +#: projects.inc:450 msgid "Factorization of large integers" msgstr "" -#: projects.inc:427 +#: projects.inc:451 msgid "" "NFS@Home is a research project that uses Internet-connected computers to do " "the lattice sieving step in the Number Field Sieve factorization of large " @@ -515,17 +526,17 @@ msgid "" "hundreds of digits long." msgstr "" -#: projects.inc:433 +#: projects.inc:457 msgid "" "Vilnius Gediminas Technical University and Kaunas University of Technology " "(Lithuania)" msgstr "" -#: projects.inc:434 +#: projects.inc:458 msgid "Software testing" msgstr "" -#: projects.inc:435 +#: projects.inc:459 msgid "" "The aim of this project is to provide a powerful distributed computing " "platform for scientists of Vilnius Gediminas Technical University (VGTU) as " @@ -533,11 +544,11 @@ msgid "" "involve the study of Monte-Carlo based software testing." msgstr "" -#: projects.inc:457 +#: projects.inc:481 msgid "Mathematical Institute of Leiden University / Kennislink" msgstr "" -#: projects.inc:459 +#: projects.inc:483 msgid "" "Search for 'abc-triples': positive integers a,b,c such that a+b=c, a < b " "< c, a,b,c have no common divisors and c > rad(abc), where rad(n) is the " @@ -548,24 +559,23 @@ msgid "" "problems can be answered directly from it." msgstr "" -#: projects.inc:467 +#: projects.inc:491 msgid "" -"Primegrid is generating a public sequential prime number database, and is " -"searching for large twin primes of the form k*2n+1 and k*2n-1" +"Primegrid has multiple projects searching for different forms of very large " +"prime numbers, including searching for the largest known prime number." msgstr "" -#: projects.inc:473 +#: projects.inc:497 msgid "Hochschule RheinMain University of Applied Sciences" msgstr "" -#: projects.inc:475 +#: projects.inc:499 msgid "" "Search for counterexamples to two conjectures related to the identification " "of prime numbers" msgstr "" -#: projects.inc:483 +#: projects.inc:507 msgid "" "Find all the generalized binary number systems (in which bases are matrices " "and digits are vectors) up to dimension 11." @@ -584,16 +594,16 @@ msgstr "" msgid "This page is %stranslatable%s." msgstr "" -#: download.php:40 +#: download.php:38 msgid "Download BOINC" msgstr "" -#: download.php:42 +#: download.php:40 #, php-format msgid "%s for %s (%s MB)" msgstr "" -#: download.php:89 +#: download.php:87 msgid "" "BOINC is a program that lets you donate your idle computer time to science " "projects like SETI@home, Climateprediction.net, Rosetta@home, World " @@ -601,37 +611,37 @@ msgid "" "computer, you can connect it to as many of these projects as you like." msgstr "" -#: download.php:91 +#: download.php:89 msgid "" "You may run this software on a computer only if you own the computer or have " "the permission of its owner." msgstr "" -#: download.php:121 +#: download.php:131 msgid "System requirements" msgstr "" -#: download.php:122 +#: download.php:132 msgid "Release notes" msgstr "" -#: download.php:123 index.php:85 +#: download.php:133 index.php:85 msgid "Help" msgstr "" -#: download.php:124 +#: download.php:134 msgid "All versions" msgstr "" -#: download.php:125 +#: download.php:135 msgid "Version history" msgstr "" -#: download.php:126 +#: download.php:136 msgid "GPU computing" msgstr "" -#: download.php:144 +#: download.php:154 msgid "BOINC: compute for science" msgstr "" @@ -869,3 +879,12 @@ msgstr "" #: index.php:278 msgid "BOINC is based at The University of California, Berkeley" msgstr "" + +#: ../html/inc/news.inc:40 +msgid "Comment" +msgstr "" + +#: ../html/inc/news.inc:111 +#, php-format +msgid "News is available as an %sRSS feed%s" +msgstr ""