From 10f7576416da2587623cc214e7e55afe96f57c4b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 11 Nov 2012 00:02:35 -0800 Subject: [PATCH 1/4] - remove job submission: fix SQL typo and error messages. From Niclas Lockner. --- checkin_notes | 9 +++++++++ html/user/submit_rpc_handler.php | 2 +- tools/manage_privileges | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 050d63f662..bec404020f 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6744,3 +6744,12 @@ David 10 Nov 2012 - fix typo in mass email script html/ops/ mass_email.php + +David 11 Nov 2012 + - remove job submission: fix SQL typo and error messages. + From Niclas Lockner. + + html/user/ + submit_rpc_handler.php + tools/ + manage_privileges diff --git a/html/user/submit_rpc_handler.php b/html/user/submit_rpc_handler.php index a0d8db0e86..9a2686acb3 100644 --- a/html/user/submit_rpc_handler.php +++ b/html/user/submit_rpc_handler.php @@ -115,7 +115,7 @@ function stage_file($file) { $md5 = md5_file($file->source); if (!$md5) { - error("Can't get MD5 of file $source"); + error("Can't get MD5 of file $file->source"); } $name = "batch_$md5"; $path = dir_hier_path($name, "../../download", $fanout); diff --git a/tools/manage_privileges b/tools/manage_privileges index bf3ca38da2..55f95b67cb 100755 --- a/tools/manage_privileges +++ b/tools/manage_privileges @@ -122,14 +122,14 @@ if ($argv[3] === "all") { } } else { if ($grant) { - BoincUserSubmit::insert("set user_id=$user->id, manage_all=1)"); + BoincUserSubmit::insert("set user_id=$user->id, manage_all=1"); } else { die("User $user->id does not have global manage access\n"); } } } else { $app = BoincApp::lookup("name='".$argv[3]."'"); - if (!$app) die("no such app: ".$argv[2]."\n"); + if (!$app) die("no such app: ".$argv[3]."\n"); $busa = BoincUserSubmitApp::lookup("user_id=$user->id and app_id=$app->id"); if ($busa) { if ($grant) { From 7768f6da60cd01f97a7e23f34d4ac64d32edd21d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 13 Nov 2012 14:36:56 -0800 Subject: [PATCH 2/4] - client: fix bug where, when updating a project, we fail to request work even though higher-priority projects are marked as no-new-tasks or are otherwise ineligible for work fetch. --- checkin_notes | 9 +++++++++ client/cs_scheduler.cpp | 6 +++--- client/work_fetch.cpp | 19 +++++++++++++++---- client/work_fetch.h | 5 +++-- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/checkin_notes b/checkin_notes index 64d2ba67e6..2fd6a11aa9 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6764,3 +6764,12 @@ David 12 Nov 2012 boinc.sln client/ client_types.h + +David 13 Nov 2012 + - client: fix bug where, when updating a project, we fail to request work + even though higher-priority projects are marked as no-new-tasks + or are otherwise ineligible for work fetch. + + client/ + cs_scheduler.cpp + work_fetch.cpp diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp index 133172e32f..7400e76ed9 100644 --- a/client/cs_scheduler.cpp +++ b/client/cs_scheduler.cpp @@ -430,13 +430,13 @@ bool CLIENT_STATE::scheduler_rpc_poll() { p->rsc_pwf[i].clear_backoff(); } } - work_fetch.compute_work_request(p); + work_fetch.piggyback_work_request(p); scheduler_op->init_op_project(p, p->sched_rpc_pending); return true; } p = next_project_trickle_up_pending(); if (p) { - work_fetch.compute_work_request(p); + work_fetch.piggyback_work_request(p); scheduler_op->init_op_project(p, RPC_REASON_TRICKLE_UP); return true; } @@ -447,7 +447,7 @@ bool CLIENT_STATE::scheduler_rpc_poll() { suspend_soon |= global_prefs.cpu_times.suspended(now + 1800); p = find_project_with_overdue_results(suspend_soon); if (p && !actively_uploading(p)) { - work_fetch.compute_work_request(p); + work_fetch.piggyback_work_request(p); scheduler_op->init_op_project(p, RPC_REASON_RESULTS_DUE); return true; } diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp index e98bfed6f2..b296ed8cf7 100644 --- a/client/work_fetch.cpp +++ b/client/work_fetch.cpp @@ -552,13 +552,22 @@ void PROJECT_WORK_FETCH::reset(PROJECT* p) { /////////////// WORK_FETCH /////////////// +// mark the projects from which we can fetch work +// +void WORK_FETCH::compute_cant_fetch_work_reason() { + for (unsigned int i=0; ipwf.cant_fetch_work_reason = p->pwf.compute_cant_fetch_work_reason(p); + } +} + void WORK_FETCH::rr_init() { for (int i=0; ipwf.cant_fetch_work_reason = p->pwf.compute_cant_fetch_work_reason(p); p->pwf.n_runnable_jobs = 0; for (int j=0; jrsc_pwf[j].rr_init(p, j); @@ -663,7 +672,7 @@ void WORK_FETCH::clear_request() { // we're going to contact this project for reasons other than work fetch; // decide if we should piggy-back a work fetch request. // -void WORK_FETCH::compute_work_request(PROJECT* p) { +void WORK_FETCH::piggyback_work_request(PROJECT* p) { clear_request(); if (config.fetch_minimal_work && gstate.had_or_requested_work) return; if (p->dont_request_more_work) return; @@ -674,9 +683,10 @@ void WORK_FETCH::compute_work_request(PROJECT* p) { return; } + compute_cant_fetch_work_reason(); PROJECT* bestp = choose_project(false); if (p != bestp) { - if (!p->pwf.cant_fetch_work_reason) { + if (p->pwf.cant_fetch_work_reason == 0) { if (bestp) { p->pwf.cant_fetch_work_reason = CANT_FETCH_WORK_NOT_HIGHEST_PRIORITY; } else { @@ -704,7 +714,8 @@ PROJECT* WORK_FETCH::non_cpu_intensive_project_needing_work() { } // choose a project to fetch work from, -// and set the request fields of resource objects +// and set the request fields of resource objects. +// If strict is true, enforce hysteresis and backoff rules // PROJECT* WORK_FETCH::choose_project(bool strict) { PROJECT* p; diff --git a/client/work_fetch.h b/client/work_fetch.h index 4f1a1d371d..13e66aaa4d 100644 --- a/client/work_fetch.h +++ b/client/work_fetch.h @@ -298,9 +298,9 @@ struct WORK_FETCH { // even if buffer is above min level // or project is backed off for a resource type PROJECT* non_cpu_intensive_project_needing_work(); - void compute_work_request(PROJECT*); + void piggyback_work_request(PROJECT*); // we're going to contact this project anyway; - // decide how much work to task for + // piggyback a work request if appropriate. void accumulate_inst_sec(ACTIVE_TASK*, double dt); void write_request(FILE*, PROJECT*); void handle_reply( @@ -311,6 +311,7 @@ struct WORK_FETCH { void set_all_requests_hyst(PROJECT*, int rsc_type); void print_state(); void init(); + void compute_cant_fetch_work_reason(); void rr_init(); void clear_request(); void compute_shares(); From b4408c9585f2c1373cb874528a78a236552c95bf Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 13 Nov 2012 14:58:32 -0800 Subject: [PATCH 3/4] - build fixes for OpenBSD, from rustyBSD --- checkin_notes | 7 +++++++ client/hostinfo_unix.cpp | 11 ++--------- configure.ac | 27 ++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/checkin_notes b/checkin_notes index 2fd6a11aa9..e7299e86d5 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6773,3 +6773,10 @@ David 13 Nov 2012 client/ cs_scheduler.cpp work_fetch.cpp + +David 13 Nov 2012 + - build fixes for OpenBSD, from rustyBSD + + configure.ac + client/ + hostinfo_unix.cpp diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp index b535b3395e..081b5eada7 100644 --- a/client/hostinfo_unix.cpp +++ b/client/hostinfo_unix.cpp @@ -1365,15 +1365,8 @@ int HOST_INFO::get_host_info() { getsysinfo( GSI_PHYSMEM, (caddr_t) &mem_size, sizeof( mem_size)); m_nbytes = 1024.* (double)mem_size; #elif defined(HW_PHYSMEM) - // for OpenBSD - mib[0] = CTL_HW; - int mem_size; - mib[1] = HW_PHYSMEM; - len = sizeof(mem_size); - sysctl(mib, 2, &mem_size, &len, NULL, 0); - m_nbytes = mem_size; -#elif defined(__FreeBSD__) - unsigned int mem_size; + // for OpenBSD & NetBSD & FreeBSD + int mem_size; mib[0] = CTL_HW; mib[1] = HW_PHYSMEM; len = sizeof(mem_size); diff --git a/configure.ac b/configure.ac index 2b9d1c4371..1649567cb1 100644 --- a/configure.ac +++ b/configure.ac @@ -602,7 +602,32 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_TIME AC_TYPE_SIGNAL -AC_CHECK_HEADERS(windows.h sys/types.h sys/un.h arpa/inet.h dirent.h grp.h fcntl.h inttypes.h stdint.h malloc.h alloca.h memory.h netdb.h netinet/in.h netinet/tcp.h netinet/ether.h net/if.h net/if_arp.h signal.h strings.h sys/auxv.h sys/file.h sys/fcntl.h sys/ipc.h sys/ioctl.h sys/mount.h sys/msg.h sys/param.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/socket.h sys/stat.h sys/statvfs.h sys/statfs.h sys/swap.h sys/sysctl.h sys/systeminfo.h sys/time.h sys/types.h sys/utsname.h sys/vmmeter.h sys/wait.h unistd.h utmp.h errno.h procfs.h ieeefp.h setjmp.h resolv.h) +AC_CHECK_HEADERS(windows.h sys/types.h sys/un.h arpa/inet.h dirent.h grp.h fcntl.h inttypes.h stdint.h malloc.h alloca.h memory.h netdb.h netinet/in.h netinet/tcp.h netinet/ether.h signal.h strings.h sys/auxv.h sys/file.h sys/fcntl.h sys/ipc.h sys/ioctl.h sys/msg.h sys/param.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/socket.h sys/stat.h sys/statvfs.h sys/statfs.h sys/systeminfo.h sys/time.h sys/types.h sys/utsname.h sys/vmmeter.h sys/wait.h unistd.h utmp.h errno.h procfs.h ieeefp.h setjmp.h) + +AC_CHECK_HEADER(net/if.h, [], [], [[ +#if HAVE_SYS_SOCKET_H +# include +#endif +]]) + +AC_CHECK_HEADER(net/if_arp.h, [], [], [[ +#if HAVE_SYS_SOCKET_H +# include +#endif +]]) + +AC_CHECK_HEADERS(sys/sysctl.h sys/mount.h sys/swap.h, [], [], [[ +#ifdef HAVE_SYS_PARAM_H +# include +#endif +]]) + +AC_CHECK_HEADER(resolv.h, [], [], [[ +#ifdef HAVE_NETINET_IN_H +# include +#endif +]]) + AC_CHECK_HEADERS(netinet/if_ether.h,[],[],[[ #ifdef HAVE_SYS_TYPES_H #include From a1b3935b21b6188f5430e4b90e98d783f5b3bd7e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 13 Nov 2012 16:43:32 -0800 Subject: [PATCH 4/4] - web: update .pot file for project web site translations --- checkin_notes | 6 + doc/projects.inc | 2 +- locale/templates/BOINC-Project-Generic.pot | 1049 ++++++++++---------- 3 files changed, 541 insertions(+), 516 deletions(-) diff --git a/checkin_notes b/checkin_notes index e7299e86d5..f93b7e7671 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6780,3 +6780,9 @@ David 13 Nov 2012 configure.ac client/ hostinfo_unix.cpp + +David 13 Nov 2012 + - web: update .pot file for project web site translations + + locale/templates/ + BOINC-Project-Generic.pot diff --git a/doc/projects.inc b/doc/projects.inc index 0e7c2c2f1d..7acda50440 100644 --- a/doc/projects.inc +++ b/doc/projects.inc @@ -317,7 +317,7 @@ $math = array( array( array( "OProject@Home", - "http://oproject.goldbach.pl/", + "http://oproject.info/", tra("Private"), tra("Mathematics, Physics, Artificial Intelligence"), tra("Simulation of quantum computing; Goldbach's conjecture."), diff --git a/locale/templates/BOINC-Project-Generic.pot b/locale/templates/BOINC-Project-Generic.pot index 8a9fba06c9..1524e2c2c9 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: 2012-01-16 11:31 PST\n" +"POT-Creation-Date: 2012-11-13 16:40 PST\n" "Last-Translator: Generated automatically from source files\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -68,7 +68,7 @@ msgid "" "Font color: [color=red]text[/color] Tip: you can also use color=#FF0000" msgstr "" -#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:625 +#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:624 msgid "Default" msgstr "" @@ -184,7 +184,7 @@ msgstr "" msgid "Advanced search" msgstr "" -#: ../inc/forum.inc:132 ../inc/user.inc:250 ../user/pm.php:69 +#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69 #: ../user/pm.php:133 msgid "Private messages" msgstr "" @@ -194,9 +194,9 @@ msgstr "" msgid "Questions and Answers" msgstr "" -#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:247 -#: ../inc/user.inc:370 ../user/forum_forum.php:73 ../user/sample_index.php:118 -#: ../project.sample/project.inc:46 +#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250 +#: ../inc/user.inc:375 ../user/forum_forum.php:73 ../user/sample_index.php:118 +#: ../project.sample/project.inc:47 msgid "Message boards" msgstr "" @@ -204,141 +204,153 @@ msgstr "" msgid "%1 message board" msgstr "" -#: ../inc/forum.inc:238 ../inc/result.inc:658 +#: ../inc/forum.inc:245 ../inc/result.inc:681 msgid "Previous" msgstr "" -#: ../inc/forum.inc:260 ../inc/result.inc:667 +#: ../inc/forum.inc:283 ../inc/result.inc:690 msgid "Next" msgstr "" -#: ../inc/forum.inc:535 +#: ../inc/forum.inc:412 ../inc/forum.inc:1174 ../user/forum_forum.php:137 +#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76 +msgid "Author" +msgstr "" + +#: ../inc/forum.inc:412 ../inc/pm.inc:86 ../user/forum_edit.php:128 +#: ../user/forum_edit.php:133 ../user/forum_post.php:116 +#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76 +#: ../user/pm.php:90 ../user/pm.php:144 +msgid "Message" +msgstr "" + +#: ../inc/forum.inc:580 msgid "Send message" msgstr "" -#: ../inc/forum.inc:535 +#: ../inc/forum.inc:580 msgid "Send %1 a private message" msgstr "" -#: ../inc/forum.inc:536 +#: ../inc/forum.inc:581 msgid "Joined: %1" msgstr "" -#: ../inc/forum.inc:545 +#: ../inc/forum.inc:590 msgid "Posts: %1" msgstr "" -#: ../inc/forum.inc:551 +#: ../inc/forum.inc:596 msgid "Credit: %1" msgstr "" -#: ../inc/forum.inc:552 +#: ../inc/forum.inc:597 msgid "RAC: %1" msgstr "" -#: ../inc/forum.inc:574 +#: ../inc/forum.inc:619 msgid "You haven't read this message yet" msgstr "" -#: ../inc/forum.inc:574 +#: ../inc/forum.inc:619 msgid "Unread" msgstr "" -#: ../inc/forum.inc:577 ../inc/forum.inc:582 ../inc/forum.inc:681 +#: ../inc/forum.inc:622 ../inc/forum.inc:627 ../inc/forum.inc:726 msgid "Message %1" msgstr "" -#: ../inc/forum.inc:578 ../inc/user.inc:324 ../user/forum_forum.php:172 +#: ../inc/forum.inc:623 ../inc/user.inc:329 ../user/forum_forum.php:174 msgid "hidden" msgstr "" -#: ../inc/forum.inc:579 +#: ../inc/forum.inc:624 msgid "Posted: %1" msgstr "" -#: ../inc/forum.inc:582 +#: ../inc/forum.inc:627 msgid " - in response to " msgstr "" -#: ../inc/forum.inc:585 ../inc/prefs.inc:691 ../inc/prefs.inc:693 +#: ../inc/forum.inc:630 ../inc/prefs.inc:690 ../inc/prefs.inc:692 msgid "Edit" msgstr "" -#: ../inc/forum.inc:585 +#: ../inc/forum.inc:630 msgid "Edit this message" msgstr "" -#: ../inc/forum.inc:591 +#: ../inc/forum.inc:636 msgid "Last modified: %1" msgstr "" -#: ../inc/forum.inc:594 +#: ../inc/forum.inc:639 msgid "" "This post is not shown because the sender is on your 'ignore' list. Click " "%1here%2 to view this post" msgstr "" -#: ../inc/forum.inc:622 ../inc/forum.inc:633 +#: ../inc/forum.inc:667 ../inc/forum.inc:678 msgid "Report this post as offensive" msgstr "" -#: ../inc/forum.inc:622 ../inc/forum.inc:633 +#: ../inc/forum.inc:667 ../inc/forum.inc:678 msgid "Report as offensive" msgstr "" -#: ../inc/forum.inc:626 +#: ../inc/forum.inc:671 msgid "Rating: %1" msgstr "" -#: ../inc/forum.inc:626 +#: ../inc/forum.inc:671 msgid "rate: " msgstr "" -#: ../inc/forum.inc:629 +#: ../inc/forum.inc:674 msgid "Click if you like this message" msgstr "" -#: ../inc/forum.inc:629 +#: ../inc/forum.inc:674 msgid "Rate +" msgstr "" -#: ../inc/forum.inc:631 +#: ../inc/forum.inc:676 msgid "Click if you don't like this message" msgstr "" -#: ../inc/forum.inc:631 +#: ../inc/forum.inc:676 msgid "Rate -" msgstr "" -#: ../inc/forum.inc:639 ../user/pm.php:106 ../user/pm.php:146 +#: ../inc/forum.inc:684 ../user/pm.php:106 ../user/pm.php:146 msgid "Reply" msgstr "" -#: ../inc/forum.inc:639 +#: ../inc/forum.inc:684 msgid "Post a reply to this message" msgstr "" -#: ../inc/forum.inc:641 +#: ../inc/forum.inc:686 msgid "Quote" msgstr "" -#: ../inc/forum.inc:641 +#: ../inc/forum.inc:686 msgid "Post a reply by quoting this message" msgstr "" -#: ../inc/forum.inc:662 +#: ../inc/forum.inc:707 msgid "Hidden by a moderator" msgstr "" -#: ../inc/forum.inc:683 +#: ../inc/forum.inc:728 msgid "Posted %1 by %2" msgstr "" -#: ../inc/forum.inc:701 +#: ../inc/forum.inc:746 msgid "You may not post or rate messages until %1" msgstr "" -#: ../inc/forum.inc:712 +#: ../inc/forum.inc:757 msgid "" "\n" "
    \n" @@ -356,122 +368,116 @@ msgid "" " " msgstr "" -#: ../inc/forum.inc:734 +#: ../inc/forum.inc:779 msgid "Rules:" msgstr "" -#: ../inc/forum.inc:735 +#: ../inc/forum.inc:780 msgid "More info" msgstr "" -#: ../inc/forum.inc:1008 ../user/forum_thread.php:185 +#: ../inc/forum.inc:1054 ../user/forum_thread.php:187 msgid "Unhide" msgstr "" -#: ../inc/forum.inc:1008 +#: ../inc/forum.inc:1054 msgid "Unhide this post" msgstr "" -#: ../inc/forum.inc:1010 ../user/forum_thread.php:191 +#: ../inc/forum.inc:1056 ../user/forum_thread.php:193 msgid "Hide" msgstr "" -#: ../inc/forum.inc:1010 +#: ../inc/forum.inc:1056 msgid "Hide this post" msgstr "" -#: ../inc/forum.inc:1015 ../user/forum_thread.php:224 +#: ../inc/forum.inc:1061 ../user/forum_thread.php:226 msgid "Move" msgstr "" -#: ../inc/forum.inc:1015 +#: ../inc/forum.inc:1061 msgid "Move post to a different thread" msgstr "" -#: ../inc/forum.inc:1020 +#: ../inc/forum.inc:1066 msgid "Banish author" msgstr "" -#: ../inc/forum.inc:1027 +#: ../inc/forum.inc:1073 msgid "Vote to banish author" msgstr "" -#: ../inc/forum.inc:1031 +#: ../inc/forum.inc:1077 msgid "Vote not to banish author" msgstr "" -#: ../inc/forum.inc:1036 +#: ../inc/forum.inc:1082 msgid "Start vote to banish author" msgstr "" -#: ../inc/forum.inc:1069 +#: ../inc/forum.inc:1115 msgid "Only team members can post to the team message board" msgstr "" -#: ../inc/forum.inc:1079 +#: ../inc/forum.inc:1125 msgid "" "In order to create a new thread in %1 you must have a certain amount of " "credit. This is to prevent and protect against abuse of the system." msgstr "" -#: ../inc/forum.inc:1086 +#: ../inc/forum.inc:1132 msgid "" "You cannot create any more threads right now. Please wait a while before " "trying again. This delay has been enforced to protect against abuse of the " "system." msgstr "" -#: ../inc/forum.inc:1093 +#: ../inc/forum.inc:1139 msgid "" "This thread is locked. Only forum moderators and administrators are allowed " "to post there." msgstr "" -#: ../inc/forum.inc:1098 +#: ../inc/forum.inc:1144 msgid "Can't post to a hidden thread." msgstr "" -#: ../inc/forum.inc:1126 +#: ../inc/forum.inc:1172 msgid "Thread" msgstr "" -#: ../inc/forum.inc:1127 ../inc/team.inc:120 ../user/forum_forum.php:135 +#: ../inc/forum.inc:1173 ../inc/team.inc:120 ../user/forum_forum.php:136 #: ../user/forum_index.php:94 msgid "Posts" msgstr "" -#: ../inc/forum.inc:1128 ../user/forum_forum.php:136 -#: ../user/forum_reply.php:115 ../user/forum_report_post.php:75 -#: ../user/forum_thread.php:263 -msgid "Author" -msgstr "" - -#: ../inc/forum.inc:1129 ../user/forum_forum.php:137 +#: ../inc/forum.inc:1175 ../user/forum_forum.php:138 msgid "Views" msgstr "" -#: ../inc/forum.inc:1130 ../inc/team.inc:120 ../user/forum_forum.php:138 +#: ../inc/forum.inc:1176 ../inc/team.inc:120 ../user/forum_forum.php:139 #: ../user/forum_help_desk.php:46 ../user/forum_index.php:95 msgid "Last post" msgstr "" -#: ../inc/forum.inc:1188 +#: ../inc/forum.inc:1234 msgid "New posts in the thread %1" msgstr "" -#: ../inc/forum.inc:1193 +#: ../inc/forum.inc:1239 msgid "New posts in subscribed thread" msgstr "" -#: ../inc/forum.inc:1194 +#: ../inc/forum.inc:1240 msgid "There are new posts in the thread '%1'" msgstr "" -#: ../inc/forum.inc:1204 +#: ../inc/forum.inc:1250 msgid "Mark all threads as read" msgstr "" -#: ../inc/forum.inc:1205 +#: ../inc/forum.inc:1251 msgid "Mark all threads in all message boards as read." msgstr "" @@ -483,21 +489,21 @@ msgstr "" msgid "Unavailable" msgstr "" -#: ../inc/host.inc:55 ../inc/prefs.inc:626 ../inc/prefs.inc:1026 +#: ../inc/host.inc:55 ../inc/prefs.inc:625 ../inc/prefs.inc:1030 msgid "Home" msgstr "" -#: ../inc/host.inc:56 ../inc/prefs.inc:628 ../inc/prefs.inc:1027 +#: ../inc/host.inc:56 ../inc/prefs.inc:627 ../inc/prefs.inc:1031 #: ../user/server_status.php:319 msgid "Work" msgstr "" -#: ../inc/host.inc:57 ../inc/prefs.inc:627 ../inc/prefs.inc:1028 +#: ../inc/host.inc:57 ../inc/prefs.inc:626 ../inc/prefs.inc:1032 msgid "School" msgstr "" -#: ../inc/host.inc:59 ../user/edit_forum_preferences_form.php:173 -#: ../user/edit_forum_preferences_form.php:174 +#: ../inc/host.inc:59 ../user/edit_forum_preferences_form.php:172 +#: ../user/edit_forum_preferences_form.php:173 msgid "Update" msgstr "" @@ -533,12 +539,12 @@ msgstr "" msgid "UTC %1 hours" msgstr "" -#: ../inc/host.inc:98 ../inc/host.inc:645 ../inc/result.inc:591 +#: ../inc/host.inc:98 ../inc/host.inc:645 ../inc/result.inc:614 #: ../inc/team.inc:202 ../inc/team.inc:350 ../inc/user.inc:200 -#: ../user/account_finish.php:41 ../user/create_account_form.php:89 +#: ../user/account_finish.php:41 ../user/create_account_form.php:87 #: ../user/team_admins.php:62 ../user/team_change_founder_form.php:77 #: ../user/team_email_list.php:64 ../user/top_users.php:49 -#: ../user/user_search.php:105 ../user/user_search.php:163 +#: ../user/user_search.php:139 msgid "Name" msgstr "" @@ -550,7 +556,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../inc/host.inc:108 ../inc/result.inc:593 +#: ../inc/host.inc:108 ../inc/result.inc:616 msgid "Created" msgstr "" @@ -561,13 +567,12 @@ msgstr "" #: ../user/profile_search_action.php:43 #: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64 #: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54 -#: ../user/top_users.php:59 ../user/user_search.php:105 -#: ../user/user_search.php:163 +#: ../user/top_users.php:59 ../user/user_search.php:140 msgid "Total credit" msgstr "" #: ../inc/host.inc:110 ../inc/user.inc:122 ../user/team_search.php:70 -#: ../user/user_search.php:105 ../user/user_search.php:163 +#: ../user/user_search.php:139 msgid "Average credit" msgstr "" @@ -647,9 +652,9 @@ msgstr "" msgid "%1 KB/sec" msgstr "" -#: ../inc/host.inc:153 ../inc/host.inc:160 ../inc/result.inc:195 -#: ../inc/result.inc:205 ../inc/result.inc:223 ../inc/result.inc:241 -#: ../inc/result.inc:257 ../user/explain_state.php:56 +#: ../inc/host.inc:153 ../inc/host.inc:160 ../inc/result.inc:207 +#: ../inc/result.inc:217 ../inc/result.inc:235 ../inc/result.inc:253 +#: ../inc/result.inc:269 ../user/explain_state.php:56 #: ../user/host_app_versions.php:29 msgid "Unknown" msgstr "" @@ -658,7 +663,7 @@ msgstr "" msgid "Average download rate" msgstr "" -#: ../inc/host.inc:163 ../user/host_app_versions.php:65 +#: ../inc/host.inc:163 ../user/host_app_versions.php:64 msgid "Average turnaround time" msgstr "" @@ -829,7 +834,7 @@ msgstr "" msgid "Only computers active in past 30 days" msgstr "" -#: ../inc/host.inc:642 ../inc/result.inc:600 +#: ../inc/host.inc:642 ../inc/result.inc:623 msgid "Computer ID" msgstr "" @@ -858,7 +863,7 @@ msgstr "" msgid "Write" msgstr "" -#: ../inc/pm.inc:33 ../inc/user.inc:373 +#: ../inc/pm.inc:33 ../inc/user.inc:378 msgid "Send private message" msgstr "" @@ -867,8 +872,8 @@ msgstr "" #: ../user/forum_edit.php:101 ../user/forum_edit.php:145 #: ../user/forum_post.php:61 ../user/forum_post.php:87 #: ../user/forum_post.php:89 ../user/forum_post.php:130 -#: ../user/forum_reply.php:77 ../user/forum_reply.php:106 -#: ../user/forum_reply.php:108 ../user/forum_reply.php:153 ../user/pm.php:181 +#: ../user/forum_reply.php:74 ../user/forum_reply.php:107 +#: ../user/forum_reply.php:109 ../user/forum_reply.php:165 ../user/pm.php:181 msgid "Preview" msgstr "" @@ -888,13 +893,6 @@ msgstr "" msgid "Subject" msgstr "" -#: ../inc/pm.inc:86 ../user/forum_edit.php:128 ../user/forum_edit.php:133 -#: ../user/forum_post.php:116 ../user/forum_reply.php:115 -#: ../user/forum_report_post.php:75 ../user/forum_thread.php:263 -#: ../user/pm.php:90 ../user/pm.php:144 -msgid "Message" -msgstr "" - #: ../inc/pm.inc:89 msgid "Send message" msgstr "" @@ -917,7 +915,7 @@ msgid "" "time before sending more messages." msgstr "" -#: ../inc/pm.inc:176 ../user/forum_forum.php:184 +#: ../inc/pm.inc:176 ../user/forum_forum.php:186 msgid "unread" msgstr "" @@ -1043,65 +1041,62 @@ msgid "Memory: when computer is not in use, use at most" msgstr "" #: ../inc/prefs.inc:217 -msgid "" -"Computer is connected to the Internet about every %1 Leave blank or 0 if " -"always connected. %2 BOINC will try to maintain at least this much work (max " -"10 days). %3" +msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2" msgstr "" -#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270 -#: ../inc/util.inc:244 +#: ../inc/prefs.inc:222 ../inc/prefs.inc:227 ../inc/prefs.inc:269 +#: ../inc/util.inc:264 msgid "days" msgstr "" -#: ../inc/prefs.inc:226 -msgid "Maintain enough work for an additional" +#: ../inc/prefs.inc:225 +msgid "... and up to an additional" msgstr "" -#: ../inc/prefs.inc:232 +#: ../inc/prefs.inc:231 msgid "" "Confirm before connecting to Internet? %1 Matters only if you have a modem, " "ISDN or VPN connection %2" msgstr "" -#: ../inc/prefs.inc:241 +#: ../inc/prefs.inc:240 msgid "" "Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN " "connection %2" msgstr "" -#: ../inc/prefs.inc:249 +#: ../inc/prefs.inc:248 msgid "Maximum download rate:" msgstr "" -#: ../inc/prefs.inc:251 ../inc/prefs.inc:256 +#: ../inc/prefs.inc:250 ../inc/prefs.inc:255 msgid "Kbytes/sec" msgstr "" -#: ../inc/prefs.inc:254 +#: ../inc/prefs.inc:253 msgid "Maximum upload rate:" msgstr "" -#: ../inc/prefs.inc:259 +#: ../inc/prefs.inc:258 msgid "Use network only between the hours of" msgstr "" -#: ../inc/prefs.inc:263 +#: ../inc/prefs.inc:262 msgid "Transfer at most %1 Enforced by version 6.10.46+ %2" msgstr "" -#: ../inc/prefs.inc:269 +#: ../inc/prefs.inc:268 msgid "Mbytes every" msgstr "" -#: ../inc/prefs.inc:274 +#: ../inc/prefs.inc:273 msgid "" "Skip image file verification? %1 Check this ONLY if your Internet provider " "modifies image files (UMTS does this, for example). %2 Skipping verification " "reduces the security of BOINC. %3" msgstr "" -#: ../inc/prefs.inc:287 +#: ../inc/prefs.inc:286 msgid "" "Resource share %1 Determines the proportion of your computer's resources " "allocated to this project. Example: if you participate in two BOINC projects " @@ -1109,160 +1104,156 @@ msgid "" "resources and the second will get 2/3. %2" msgstr "" -#: ../inc/prefs.inc:298 +#: ../inc/prefs.inc:297 msgid "Accelerate GPU tasks by dedicating a CPU to each one?" msgstr "" -#: ../inc/prefs.inc:308 +#: ../inc/prefs.inc:307 msgid "Use CPU %1 Enforced by version 6.10+ %2" msgstr "" -#: ../inc/prefs.inc:320 +#: ../inc/prefs.inc:319 msgid "Use ATI GPU %1 Enforced by version 6.10+ %2" msgstr "" -#: ../inc/prefs.inc:332 +#: ../inc/prefs.inc:331 msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2" msgstr "" -#: ../inc/prefs.inc:346 +#: ../inc/prefs.inc:345 msgid "" "Run test applications? %1 This helps us develop applications, but may cause " "jobs to fail on your computer %2" msgstr "" -#: ../inc/prefs.inc:355 +#: ../inc/prefs.inc:354 msgid "" "Emails will be sent from %1; make sure your spam filter accepts this address." msgstr "" -#: ../inc/prefs.inc:362 +#: ../inc/prefs.inc:361 msgid "Is it OK for %1 and your team (if any) to email you?" msgstr "" -#: ../inc/prefs.inc:368 +#: ../inc/prefs.inc:367 msgid "Should %1 show your computers on its web site?" msgstr "" -#: ../inc/prefs.inc:375 +#: ../inc/prefs.inc:374 msgid "Disk and memory usage" msgstr "" -#: ../inc/prefs.inc:376 +#: ../inc/prefs.inc:375 msgid "Processor usage" msgstr "" -#: ../inc/prefs.inc:377 +#: ../inc/prefs.inc:376 msgid "Network usage" msgstr "" -#: ../inc/prefs.inc:380 +#: ../inc/prefs.inc:379 msgid "" "These preferences apply to all the BOINC projects in which you participate." msgstr "" -#: ../inc/prefs.inc:383 +#: ../inc/prefs.inc:382 msgid "" "%1Unable to update preferences.%2 The values marked in red below were out of " "range or not numeric." msgstr "" -#: ../inc/prefs.inc:432 +#: ../inc/prefs.inc:431 msgid "bad venue: %1" msgstr "" -#: ../inc/prefs.inc:438 +#: ../inc/prefs.inc:437 msgid "bad subset: %1" msgstr "" -#: ../inc/prefs.inc:657 ../inc/prefs.inc:660 ../inc/prefs.inc:1003 -#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:75 +#: ../inc/prefs.inc:656 ../inc/prefs.inc:659 ../inc/prefs.inc:1007 +#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:85 msgid "yes" msgstr "" -#: ../inc/prefs.inc:657 ../inc/prefs.inc:660 ../inc/prefs.inc:1005 -#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:77 +#: ../inc/prefs.inc:656 ../inc/prefs.inc:659 ../inc/prefs.inc:1009 +#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:87 msgid "no" msgstr "" -#: ../inc/prefs.inc:665 ../user/forum_search.php:53 +#: ../inc/prefs.inc:664 ../user/forum_search.php:53 msgid "no limit" msgstr "" -#: ../inc/prefs.inc:690 ../user/team_admins.php:79 +#: ../inc/prefs.inc:689 ../user/team_admins.php:79 msgid "Add" msgstr "" -#: ../inc/prefs.inc:692 ../inc/prefs.inc:818 -#: ../user/edit_forum_preferences_form.php:161 ../user/team_admins.php:34 +#: ../inc/prefs.inc:691 ../inc/prefs.inc:819 +#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34 msgid "Remove" msgstr "" -#: ../inc/prefs.inc:798 ../user/explain_state.php:94 +#: ../inc/prefs.inc:797 ../user/explain_state.php:94 msgid "Computing" msgstr "" -#: ../inc/prefs.inc:809 +#: ../inc/prefs.inc:808 msgid "Separate preferences for %1" msgstr "" -#: ../inc/prefs.inc:818 ../inc/prefs.inc:893 +#: ../inc/prefs.inc:818 ../inc/prefs.inc:896 msgid "Edit preferences" msgstr "" -#: ../inc/prefs.inc:822 +#: ../inc/prefs.inc:824 msgid "Add separate preferences for %1" msgstr "" -#: ../inc/prefs.inc:830 ../inc/prefs.inc:875 +#: ../inc/prefs.inc:832 ../inc/prefs.inc:877 msgid "(Switch View)" msgstr "" -#: ../inc/prefs.inc:832 ../inc/prefs.inc:878 +#: ../inc/prefs.inc:834 ../inc/prefs.inc:880 msgid "Combined preferences" msgstr "" -#: ../inc/prefs.inc:837 +#: ../inc/prefs.inc:839 msgid "Project specific settings" msgstr "" -#: ../inc/prefs.inc:845 ../inc/prefs.inc:887 +#: ../inc/prefs.inc:847 ../inc/prefs.inc:889 msgid "Primary (default) preferences" msgstr "" -#: ../inc/prefs.inc:854 ../user/add_venue.php:43 ../user/add_venue.php:67 +#: ../inc/prefs.inc:856 ../user/add_venue.php:43 ../user/add_venue.php:67 #: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64 #: ../user/prefs_edit.php:92 msgid "Edit %1 preferences" msgstr "" -#: ../inc/prefs.inc:868 +#: ../inc/prefs.inc:870 msgid "" "These apply to all BOINC projects in which you participate.
    \n" " On computers participating in multiple projects, the most " "recently modified preferences will be used." msgstr "" -#: ../inc/prefs.inc:872 +#: ../inc/prefs.inc:874 msgid "Preferences last modified:" msgstr "" -#: ../inc/prefs.inc:922 +#: ../inc/prefs.inc:926 msgid "Add preferences" msgstr "" -#: ../inc/prefs.inc:926 +#: ../inc/prefs.inc:930 msgid "Update preferences" msgstr "" -#: ../inc/prefs.inc:1014 ../inc/prefs.inc:1023 +#: ../inc/prefs.inc:1018 ../inc/prefs.inc:1027 msgid "Default computer location" msgstr "" -#: ../inc/prefs.inc:1174 -msgid "Update failed: " -msgstr "" - #: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315 msgid "and" msgstr "" @@ -1341,312 +1332,320 @@ msgstr "" msgid "pending" msgstr "" -#: ../inc/result.inc:104 ../user/forum_search.php:60 +#: ../inc/result.inc:105 ../user/forum_search.php:60 msgid "All" msgstr "" -#: ../inc/result.inc:105 ../inc/result.inc:162 ../inc/result.inc:202 +#: ../inc/result.inc:106 ../inc/result.inc:167 ../inc/result.inc:214 msgid "In progress" msgstr "" -#: ../inc/result.inc:106 ../user/workunit.php:67 -msgid "Pending" +#: ../inc/result.inc:107 +msgid "Validation pending" msgstr "" -#: ../inc/result.inc:107 ../inc/result.inc:247 +#: ../inc/result.inc:108 +msgid "Validation inconclusive" +msgstr "" + +#: ../inc/result.inc:109 ../inc/result.inc:259 msgid "Valid" msgstr "" -#: ../inc/result.inc:108 ../inc/result.inc:250 +#: ../inc/result.inc:110 ../inc/result.inc:262 msgid "Invalid" msgstr "" -#: ../inc/result.inc:109 ../inc/result.inc:188 +#: ../inc/result.inc:111 ../inc/result.inc:200 msgid "Error" msgstr "" -#: ../inc/result.inc:160 ../inc/result.inc:200 ../user/explain_state.php:34 +#: ../inc/result.inc:165 ../inc/result.inc:212 ../user/explain_state.php:34 msgid "Inactive" msgstr "" -#: ../inc/result.inc:161 ../inc/result.inc:201 ../user/explain_state.php:37 +#: ../inc/result.inc:166 ../inc/result.inc:213 ../user/explain_state.php:37 msgid "Unsent" msgstr "" -#: ../inc/result.inc:167 +#: ../inc/result.inc:172 msgid "Completed, waiting for validation" msgstr "" -#: ../inc/result.inc:168 +#: ../inc/result.inc:173 msgid "Completed and validated" msgstr "" -#: ../inc/result.inc:169 +#: ../inc/result.inc:174 msgid "Completed, marked as invalid" msgstr "" -#: ../inc/result.inc:170 +#: ../inc/result.inc:175 msgid "Completed, can't validate" msgstr "" -#: ../inc/result.inc:171 +#: ../inc/result.inc:176 msgid "Completed, validation inconclusive" msgstr "" -#: ../inc/result.inc:172 +#: ../inc/result.inc:177 msgid "Completed, too late to validate" msgstr "" -#: ../inc/result.inc:174 +#: ../inc/result.inc:179 msgid "Completed" msgstr "" -#: ../inc/result.inc:175 ../inc/result.inc:212 ../user/explain_state.php:62 +#: ../inc/result.inc:180 ../inc/result.inc:224 ../user/explain_state.php:62 msgid "Couldn't send" msgstr "" -#: ../inc/result.inc:178 ../inc/result.inc:236 +#: ../inc/result.inc:185 ../inc/result.inc:248 msgid "Cancelled by server" msgstr "" -#: ../inc/result.inc:181 +#: ../inc/result.inc:190 +msgid "Not started by deadline - canceled" +msgstr "" + +#: ../inc/result.inc:193 msgid "Error while downloading" msgstr "" -#: ../inc/result.inc:183 +#: ../inc/result.inc:195 msgid "Error while computing" msgstr "" -#: ../inc/result.inc:184 +#: ../inc/result.inc:196 msgid "Error while uploading" msgstr "" -#: ../inc/result.inc:185 ../inc/result.inc:238 +#: ../inc/result.inc:197 ../inc/result.inc:250 msgid "Aborted by user" msgstr "" -#: ../inc/result.inc:186 ../inc/result.inc:239 +#: ../inc/result.inc:198 ../inc/result.inc:251 msgid "Upload failed" msgstr "" -#: ../inc/result.inc:189 +#: ../inc/result.inc:201 msgid "Timed out - no response" msgstr "" -#: ../inc/result.inc:190 ../inc/result.inc:219 ../user/explain_state.php:71 +#: ../inc/result.inc:202 ../inc/result.inc:231 ../user/explain_state.php:71 msgid "Didn't need" msgstr "" -#: ../inc/result.inc:191 ../inc/result.inc:220 ../user/explain_state.php:74 +#: ../inc/result.inc:203 ../inc/result.inc:232 ../user/explain_state.php:74 msgid "Validate error" msgstr "" -#: ../inc/result.inc:192 ../inc/result.inc:221 +#: ../inc/result.inc:204 ../inc/result.inc:233 msgid "Abandoned" msgstr "" -#: ../inc/result.inc:203 ../user/explain_state.php:43 +#: ../inc/result.inc:215 ../user/explain_state.php:43 msgid "Over" msgstr "" -#: ../inc/result.inc:211 ../user/explain_state.php:59 +#: ../inc/result.inc:223 ../user/explain_state.php:59 msgid "Success" msgstr "" -#: ../inc/result.inc:215 +#: ../inc/result.inc:227 msgid "Computation error" msgstr "" -#: ../inc/result.inc:217 +#: ../inc/result.inc:229 msgid "Redundant result" msgstr "" -#: ../inc/result.inc:218 ../user/explain_state.php:68 +#: ../inc/result.inc:230 ../user/explain_state.php:68 msgid "No reply" msgstr "" -#: ../inc/result.inc:228 ../user/explain_state.php:85 +#: ../inc/result.inc:240 ../user/explain_state.php:85 msgid "New" msgstr "" -#: ../inc/result.inc:229 ../user/explain_state.php:91 +#: ../inc/result.inc:241 ../user/explain_state.php:91 msgid "Downloading" msgstr "" -#: ../inc/result.inc:230 +#: ../inc/result.inc:242 msgid "Processing" msgstr "" -#: ../inc/result.inc:231 +#: ../inc/result.inc:243 msgid "Compute error" msgstr "" -#: ../inc/result.inc:232 ../user/explain_state.php:97 +#: ../inc/result.inc:244 ../user/explain_state.php:97 msgid "Uploading" msgstr "" -#: ../inc/result.inc:233 ../user/explain_state.php:88 +#: ../inc/result.inc:245 ../user/explain_state.php:88 msgid "Done" msgstr "" -#: ../inc/result.inc:246 +#: ../inc/result.inc:258 msgid "Initial" msgstr "" -#: ../inc/result.inc:252 +#: ../inc/result.inc:264 msgid "Not necessary" msgstr "" -#: ../inc/result.inc:253 +#: ../inc/result.inc:265 msgid "Workunit error - check skipped" msgstr "" -#: ../inc/result.inc:254 +#: ../inc/result.inc:266 msgid "Checked, but no consensus yet" msgstr "" -#: ../inc/result.inc:255 +#: ../inc/result.inc:267 msgid "Task was reported too late to validate" msgstr "" -#: ../inc/result.inc:281 +#: ../inc/result.inc:293 msgid "Couldn't send result" msgstr "" -#: ../inc/result.inc:285 +#: ../inc/result.inc:297 msgid "Too many errors (may have bug)" msgstr "" -#: ../inc/result.inc:289 +#: ../inc/result.inc:301 msgid "Too many results (may be nondeterministic)" msgstr "" -#: ../inc/result.inc:293 +#: ../inc/result.inc:305 msgid "Too many total results" msgstr "" -#: ../inc/result.inc:297 +#: ../inc/result.inc:309 msgid "WU cancelled" msgstr "" -#: ../inc/result.inc:301 +#: ../inc/result.inc:313 msgid "Unrecognized Error: %1" msgstr "" -#: ../inc/result.inc:328 +#: ../inc/result.inc:340 msgid "Task name" msgstr "" -#: ../inc/result.inc:328 ../inc/result.inc:333 ../inc/result.inc:336 -#: ../inc/result.inc:339 +#: ../inc/result.inc:340 ../inc/result.inc:345 ../inc/result.inc:348 +#: ../inc/result.inc:351 msgid "click for details" msgstr "" -#: ../inc/result.inc:328 +#: ../inc/result.inc:340 msgid "Show IDs" msgstr "" -#: ../inc/result.inc:333 +#: ../inc/result.inc:345 msgid "Show names" msgstr "" -#: ../inc/result.inc:336 +#: ../inc/result.inc:348 msgid "Task" msgstr "" -#: ../inc/result.inc:339 +#: ../inc/result.inc:351 msgid "Work unit" msgstr "" -#: ../inc/result.inc:342 +#: ../inc/result.inc:354 msgid "Computer" msgstr "" -#: ../inc/result.inc:345 ../inc/result.inc:594 +#: ../inc/result.inc:357 ../inc/result.inc:617 msgid "Sent" msgstr "" -#: ../inc/result.inc:346 +#: ../inc/result.inc:358 msgid "Time reported
    or deadline" msgstr "" -#: ../inc/result.inc:347 +#: ../inc/result.inc:359 msgid "explain" msgstr "" -#: ../inc/result.inc:349 ../user/server_status.php:246 +#: ../inc/result.inc:361 ../user/server_status.php:246 msgid "Status" msgstr "" -#: ../inc/result.inc:350 +#: ../inc/result.inc:362 msgid "Run time
    (sec)" msgstr "" -#: ../inc/result.inc:351 +#: ../inc/result.inc:363 msgid "CPU time
    (sec)" msgstr "" -#: ../inc/result.inc:352 ../inc/result.inc:605 +#: ../inc/result.inc:364 ../inc/result.inc:628 msgid "Credit" msgstr "" -#: ../inc/result.inc:353 ../inc/result.inc:687 +#: ../inc/result.inc:365 ../inc/result.inc:710 msgid "Application" msgstr "" -#: ../inc/result.inc:592 +#: ../inc/result.inc:615 msgid "Workunit" msgstr "" -#: ../inc/result.inc:595 +#: ../inc/result.inc:618 msgid "Received" msgstr "" -#: ../inc/result.inc:596 +#: ../inc/result.inc:619 msgid "Server state" msgstr "" -#: ../inc/result.inc:597 +#: ../inc/result.inc:620 msgid "Outcome" msgstr "" -#: ../inc/result.inc:598 +#: ../inc/result.inc:621 msgid "Client state" msgstr "" -#: ../inc/result.inc:599 +#: ../inc/result.inc:622 msgid "Exit status" msgstr "" -#: ../inc/result.inc:601 +#: ../inc/result.inc:624 msgid "Report deadline" msgstr "" -#: ../inc/result.inc:602 +#: ../inc/result.inc:625 msgid "Run time" msgstr "" -#: ../inc/result.inc:603 +#: ../inc/result.inc:626 msgid "CPU time" msgstr "" -#: ../inc/result.inc:604 +#: ../inc/result.inc:627 msgid "Validate state" msgstr "" -#: ../inc/result.inc:606 +#: ../inc/result.inc:629 msgid "Application version" msgstr "" -#: ../inc/result.inc:619 +#: ../inc/result.inc:642 msgid "Output files" msgstr "" -#: ../inc/result.inc:622 +#: ../inc/result.inc:645 msgid "Stderr output" msgstr "" -#: ../inc/result.inc:669 +#: ../inc/result.inc:692 msgid "State" msgstr "" @@ -1664,12 +1663,11 @@ msgstr "" #: ../inc/team.inc:36 ../inc/team.inc:114 ../inc/team.inc:225 #: ../inc/team.inc:365 ../inc/team.inc:449 ../inc/user.inc:206 -#: ../inc/user.inc:314 ../user/account_finish.php:45 -#: ../user/create_account_form.php:108 ../user/edit_user_info_form.php:40 +#: ../inc/user.inc:317 ../user/account_finish.php:45 +#: ../user/create_account_form.php:106 ../user/edit_user_info_form.php:40 #: ../user/profile_search_action.php:42 ../user/team_email_list.php:64 #: ../user/team_search.php:72 ../user/top_users.php:63 -#: ../user/user_search.php:105 ../user/user_search.php:123 -#: ../user/user_search.php:163 +#: ../user/user_search.php:53 ../user/user_search.php:140 msgid "Country" msgstr "" @@ -1681,7 +1679,7 @@ msgstr "" msgid "Show only active teams" msgstr "" -#: ../inc/team.inc:45 ../user/profile_menu.php:77 ../user/user_search.php:136 +#: ../inc/team.inc:45 ../user/profile_menu.php:77 ../user/user_search.php:70 msgid "Search" msgstr "" @@ -1701,8 +1699,8 @@ msgstr "" msgid "founder response deadline is %1" msgstr "" -#: ../inc/team.inc:65 ../inc/team.inc:549 ../inc/user.inc:278 -#: ../inc/user.inc:366 +#: ../inc/team.inc:65 ../inc/team.inc:549 ../inc/user.inc:281 +#: ../inc/user.inc:371 msgid "None" msgstr "" @@ -1738,7 +1736,7 @@ msgstr "" msgid "Message board" msgstr "" -#: ../inc/team.inc:120 ../user/forum_forum.php:134 ../user/forum_index.php:93 +#: ../inc/team.inc:120 ../user/forum_forum.php:135 ../user/forum_index.php:93 msgid "Threads" msgstr "" @@ -1913,8 +1911,8 @@ msgid "Pending credit" msgstr "" #: ../inc/user.inc:150 ../inc/user.inc:152 ../inc/user.inc:153 -#: ../inc/user.inc:240 ../inc/user.inc:322 ../inc/user.inc:397 -#: ../user/view_profile.php:56 +#: ../inc/user.inc:218 ../inc/user.inc:243 ../inc/user.inc:327 +#: ../inc/user.inc:402 ../user/view_profile.php:64 msgid "View" msgstr "" @@ -1934,8 +1932,8 @@ msgstr "" msgid "Account" msgstr "" -#: ../inc/user.inc:166 ../inc/user.inc:278 ../inc/user.inc:364 -#: ../inc/user.inc:366 ../user/user_search.php:105 ../user/user_search.php:163 +#: ../inc/user.inc:166 ../inc/user.inc:281 ../inc/user.inc:369 +#: ../inc/user.inc:371 ../user/user_search.php:139 msgid "Team" msgstr "" @@ -1964,7 +1962,7 @@ msgstr "" msgid "Email address" msgstr "" -#: ../inc/user.inc:204 ../inc/user.inc:316 +#: ../inc/user.inc:204 ../inc/user.inc:321 msgid "URL" msgstr "" @@ -1972,7 +1970,7 @@ msgstr "" msgid "Postal code" msgstr "" -#: ../inc/user.inc:208 ../inc/user.inc:313 +#: ../inc/user.inc:208 ../inc/user.inc:316 msgid "%1 member since" msgstr "" @@ -1992,7 +1990,7 @@ msgstr "" msgid "other account info" msgstr "" -#: ../inc/user.inc:214 ../inc/user.inc:312 +#: ../inc/user.inc:214 ../inc/user.inc:315 msgid "User ID" msgstr "" @@ -2000,202 +1998,210 @@ msgstr "" msgid "Used in community functions" msgstr "" -#: ../inc/user.inc:216 ../user/weak_auth.php:27 -msgid "Weak account key" -msgstr "" - -#: ../inc/user.inc:216 -msgid "Provides %1limited access%2 to your account" -msgstr "" - -#: ../inc/user.inc:219 -msgid "Preferences" +#: ../inc/user.inc:217 ../user/weak_auth.php:25 +msgid "Account keys" msgstr "" #: ../inc/user.inc:222 +msgid "Preferences" +msgstr "" + +#: ../inc/user.inc:225 msgid "When and how BOINC uses your computer" msgstr "" -#: ../inc/user.inc:223 +#: ../inc/user.inc:226 msgid "Computing preferences" msgstr "" -#: ../inc/user.inc:226 +#: ../inc/user.inc:229 msgid "Message boards and private messages" msgstr "" -#: ../inc/user.inc:227 ../user/edit_forum_preferences_form.php:31 +#: ../inc/user.inc:230 ../user/edit_forum_preferences_form.php:31 msgid "Community preferences" msgstr "" -#: ../inc/user.inc:230 +#: ../inc/user.inc:233 msgid "Preferences for this project" msgstr "" -#: ../inc/user.inc:231 ../user/prefs.php:33 +#: ../inc/user.inc:234 ../user/prefs.php:32 msgid "%1 preferences" msgstr "" -#: ../inc/user.inc:237 ../user/sample_index.php:114 +#: ../inc/user.inc:240 ../user/sample_index.php:114 msgid "Community" msgstr "" -#: ../inc/user.inc:240 ../user/pm.php:107 ../user/pm.php:147 +#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147 msgid "Delete" msgstr "" -#: ../inc/user.inc:242 +#: ../inc/user.inc:245 msgid "Create" msgstr "" -#: ../inc/user.inc:244 ../inc/user.inc:397 ../inc/util.inc:484 +#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:504 msgid "Profile" msgstr "" -#: ../inc/user.inc:247 ../inc/user.inc:370 +#: ../inc/user.inc:250 ../inc/user.inc:375 msgid "%1 posts" msgstr "" -#: ../inc/user.inc:259 ../user/edit_forum_preferences_form.php:51 +#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51 msgid "Notifications" msgstr "" -#: ../inc/user.inc:266 +#: ../inc/user.inc:269 msgid "Quit team" msgstr "" -#: ../inc/user.inc:268 ../inc/user.inc:285 +#: ../inc/user.inc:271 ../inc/user.inc:288 msgid "Administer" msgstr "" -#: ../inc/user.inc:274 ../inc/user.inc:287 +#: ../inc/user.inc:277 ../inc/user.inc:290 msgid "(foundership change request pending)" msgstr "" -#: ../inc/user.inc:276 +#: ../inc/user.inc:279 msgid "Member of team" msgstr "" -#: ../inc/user.inc:278 +#: ../inc/user.inc:281 msgid "find a team" msgstr "" -#: ../inc/user.inc:289 +#: ../inc/user.inc:292 msgid "Founder but not member of" msgstr "" -#: ../inc/user.inc:295 +#: ../inc/user.inc:298 msgid "Find friends" msgstr "" -#: ../inc/user.inc:302 ../inc/user.inc:304 ../inc/user.inc:380 -#: ../inc/user.inc:382 ../inc/user.inc:391 +#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385 +#: ../inc/user.inc:387 ../inc/user.inc:396 msgid "Friends" msgstr "" -#: ../inc/user.inc:322 ../inc/user.inc:324 ../user/server_status.php:396 +#: ../inc/user.inc:327 ../inc/user.inc:329 ../user/server_status.php:396 msgid "Computers" msgstr "" -#: ../inc/user.inc:331 +#: ../inc/user.inc:336 msgid "Donor" msgstr "" -#: ../inc/user.inc:373 +#: ../inc/user.inc:378 msgid "Contact" msgstr "" -#: ../inc/user.inc:376 +#: ../inc/user.inc:381 msgid "This person is a friend" msgstr "" -#: ../inc/user.inc:377 ../user/friend.php:238 +#: ../inc/user.inc:382 ../user/friend.php:238 msgid "Cancel friendship" msgstr "" -#: ../inc/user.inc:380 ../user/friend.php:37 +#: ../inc/user.inc:385 ../user/friend.php:37 msgid "Request pending" msgstr "" -#: ../inc/user.inc:382 +#: ../inc/user.inc:387 msgid "Add as friend" msgstr "" -#: ../inc/util.inc:113 +#: ../inc/user.inc:446 +msgid "user name cannot have leading or trailing white space" +msgstr "" + +#: ../inc/user.inc:450 +msgid "user name must be nonempty" +msgstr "" + +#: ../inc/user.inc:454 +msgid "user name may not contain HTML tags" +msgstr "" + +#: ../inc/util.inc:122 msgid "log out" msgstr "" -#: ../inc/util.inc:115 +#: ../inc/util.inc:124 msgid "log in" msgstr "" -#: ../inc/util.inc:174 ../user/login_form.php:37 ../user/login_form.php:62 +#: ../inc/util.inc:194 ../user/login_form.php:37 ../user/login_form.php:62 msgid "Log in" msgstr "" -#: ../inc/util.inc:175 ../user/create_account_form.php:38 +#: ../inc/util.inc:195 ../user/create_account_form.php:38 msgid "Create an account" msgstr "" -#: ../inc/util.inc:176 +#: ../inc/util.inc:196 msgid "Server status page" msgstr "" -#: ../inc/util.inc:218 +#: ../inc/util.inc:238 msgid "" "A database error occurred while handling your request; please try again " "later." msgstr "" -#: ../inc/util.inc:227 +#: ../inc/util.inc:247 msgid "Unable to handle request" msgstr "" -#: ../inc/util.inc:247 +#: ../inc/util.inc:267 msgid "hours" msgstr "" -#: ../inc/util.inc:250 +#: ../inc/util.inc:270 msgid "min" msgstr "" -#: ../inc/util.inc:253 +#: ../inc/util.inc:273 msgid "sec" msgstr "" -#: ../inc/util.inc:414 +#: ../inc/util.inc:434 msgid "Link has timed out. Please click Back, refresh the page, and try again." msgstr "" -#: ../inc/util.inc:483 +#: ../inc/util.inc:503 msgid "View the profile of %1" msgstr "" -#: ../inc/util.inc:539 +#: ../inc/util.inc:559 msgid "Use BBCode tags to format your text" msgstr "" -#: ../inc/util.inc:750 +#: ../inc/util.inc:770 msgid "Project down for maintenance" msgstr "" -#: ../inc/util.inc:753 +#: ../inc/util.inc:773 msgid "%1 is temporarily shut down for maintenance. Please try again later." msgstr "" -#: ../inc/util.inc:771 +#: ../inc/util.inc:791 msgid "Unable to connect to database - please try again later" msgstr "" -#: ../inc/util.inc:772 +#: ../inc/util.inc:792 msgid "Error:" msgstr "" -#: ../inc/util.inc:776 +#: ../inc/util.inc:796 msgid "Unable to select database - please try again later" msgstr "" -#: ../inc/util_ops.inc:130 ../user/get_passwd.php:72 +#: ../inc/util_ops.inc:129 ../user/get_passwd.php:72 msgid "Stay logged in on this computer" msgstr "" @@ -2203,27 +2209,27 @@ msgstr "" msgid "Finish account setup" msgstr "" -#: ../user/account_finish.php:41 ../user/create_account_form.php:89 +#: ../user/account_finish.php:41 ../user/create_account_form.php:87 msgid "Identifies you on our web site. Use your real name or a nickname." msgstr "" -#: ../user/account_finish.php:45 ../user/create_account_form.php:108 +#: ../user/account_finish.php:45 ../user/create_account_form.php:106 msgid "Select the country you want to represent, if any." msgstr "" -#: ../user/account_finish.php:51 ../user/create_account_form.php:114 +#: ../user/account_finish.php:51 ../user/create_account_form.php:112 msgid "Postal or ZIP Code" msgstr "" -#: ../user/account_finish.php:51 ../user/create_account_form.php:114 +#: ../user/account_finish.php:51 ../user/create_account_form.php:112 msgid "Optional" msgstr "" -#: ../user/account_finish_action.php:27 ../user/create_account_action.php:86 +#: ../user/account_finish_action.php:27 msgid "You must supply a name for your account" msgstr "" -#: ../user/account_finish_action.php:30 ../user/create_account_action.php:89 +#: ../user/account_finish_action.php:30 msgid "HTML tags not allowed in name" msgstr "" @@ -2388,28 +2394,28 @@ msgstr "" msgid "The invitation code you gave is not valid." msgstr "" -#: ../user/create_account_action.php:94 +#: ../user/create_account_action.php:91 msgid "" "Invalid email address: you must enter a valid address of the form name@domain" msgstr "" -#: ../user/create_account_action.php:98 +#: ../user/create_account_action.php:95 msgid "There's already an account with that email address." msgstr "" -#: ../user/create_account_action.php:104 ../user/edit_passwd_action.php:33 +#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:33 msgid "New passwords are different" msgstr "" -#: ../user/create_account_action.php:111 ../user/edit_passwd_action.php:41 +#: ../user/create_account_action.php:108 ../user/edit_passwd_action.php:41 msgid "Passwords may only include ASCII characters." msgstr "" -#: ../user/create_account_action.php:116 ../user/edit_passwd_action.php:45 +#: ../user/create_account_action.php:113 ../user/edit_passwd_action.php:45 msgid "New password is too short: minimum password length is %1 characters." msgstr "" -#: ../user/create_account_action.php:137 +#: ../user/create_account_action.php:134 msgid "Couldn't create account" msgstr "" @@ -2419,49 +2425,49 @@ msgstr "" #: ../user/create_account_form.php:53 msgid "" -"Don't use this form. Just run BOINC, select Add Project, and enter an email " -"address and password." +"NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, " +"select Add Project, and enter an email address and password." msgstr "" -#: ../user/create_account_form.php:71 +#: ../user/create_account_form.php:69 msgid "" "This account will belong to the team %1 and will have the project " "preferences of its founder." msgstr "" -#: ../user/create_account_form.php:83 +#: ../user/create_account_form.php:81 msgid "Invitation Code" msgstr "" -#: ../user/create_account_form.php:83 +#: ../user/create_account_form.php:81 msgid "A valid invitation code is required to create an account." msgstr "" -#: ../user/create_account_form.php:93 +#: ../user/create_account_form.php:91 msgid "Email Address" msgstr "" -#: ../user/create_account_form.php:93 +#: ../user/create_account_form.php:91 msgid "Must be a valid address of the form 'name@domain'." msgstr "" -#: ../user/create_account_form.php:102 ../user/edit_email_form.php:48 +#: ../user/create_account_form.php:100 ../user/edit_email_form.php:48 msgid "Password" msgstr "" -#: ../user/create_account_form.php:103 +#: ../user/create_account_form.php:101 msgid "Must be at least %1 characters" msgstr "" -#: ../user/create_account_form.php:106 +#: ../user/create_account_form.php:104 msgid "Confirm password" msgstr "" -#: ../user/create_account_form.php:123 +#: ../user/create_account_form.php:121 msgid "Please enter the words shown in the image" msgstr "" -#: ../user/create_account_form.php:129 +#: ../user/create_account_form.php:127 msgid "Create account" msgstr "" @@ -2607,8 +2613,8 @@ msgstr "" #: ../user/delete_account.php:79 ../user/delete_profile.php:52 #: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238 -#: ../user/prefs_remove.php:55 ../user/user_search.php:129 -#: ../user/user_search.php:134 +#: ../user/prefs_remove.php:55 ../user/user_search.php:59 +#: ../user/user_search.php:64 msgid "Yes" msgstr "" @@ -2617,8 +2623,8 @@ msgid "Delete this account" msgstr "" #: ../user/delete_account.php:80 ../user/delete_profile.php:53 -#: ../user/friend.php:239 ../user/user_search.php:128 -#: ../user/user_search.php:133 +#: ../user/friend.php:239 ../user/user_search.php:58 +#: ../user/user_search.php:63 msgid "No" msgstr "" @@ -2830,30 +2836,30 @@ msgstr "" msgid "No password?" msgstr "" -#: ../user/edit_forum_preferences_action.php:35 +#: ../user/edit_forum_preferences_action.php:33 msgid "Confirm reset" msgstr "" -#: ../user/edit_forum_preferences_action.php:36 +#: ../user/edit_forum_preferences_action.php:34 msgid "" "This action will erase any changes you have made in your community " "preferences. To cancel, click your browser's Back button." msgstr "" -#: ../user/edit_forum_preferences_action.php:40 +#: ../user/edit_forum_preferences_action.php:38 msgid "Reset preferences" msgstr "" -#: ../user/edit_forum_preferences_action.php:90 +#: ../user/edit_forum_preferences_action.php:88 msgid "Error: Not the right kind of file, only PNG and JPEG are supported." msgstr "" -#: ../user/edit_forum_preferences_action.php:116 +#: ../user/edit_forum_preferences_action.php:114 msgid "Your signature was too long, please keep it less than 250 characters." msgstr "" -#: ../user/edit_forum_preferences_action.php:139 -#: ../user/edit_forum_preferences_action.php:153 +#: ../user/edit_forum_preferences_action.php:132 +#: ../user/edit_forum_preferences_action.php:146 msgid "No such user: %1" msgstr "" @@ -2966,64 +2972,60 @@ msgstr "" msgid "Highlight special users" msgstr "" -#: ../user/edit_forum_preferences_form.php:138 +#: ../user/edit_forum_preferences_form.php:135 +msgid "Display this many messages per page" +msgstr "" + +#: ../user/edit_forum_preferences_form.php:139 msgid "How to sort" msgstr "" -#: ../user/edit_forum_preferences_form.php:139 +#: ../user/edit_forum_preferences_form.php:140 msgid "Threads:" msgstr "" -#: ../user/edit_forum_preferences_form.php:139 +#: ../user/edit_forum_preferences_form.php:140 msgid "Posts:" msgstr "" -#: ../user/edit_forum_preferences_form.php:140 +#: ../user/edit_forum_preferences_form.php:141 msgid "Jump to first new post in thread automatically" msgstr "" -#: ../user/edit_forum_preferences_form.php:141 -msgid "Do not reorder sticky posts" -msgstr "" - #: ../user/edit_forum_preferences_form.php:142 -msgid "If a thread contains more than this number of posts" +msgid "Don't move sticky posts to top" msgstr "" -#: ../user/edit_forum_preferences_form.php:143 -msgid "only display the first one and this many of the last ones" -msgstr "" - -#: ../user/edit_forum_preferences_form.php:149 +#: ../user/edit_forum_preferences_form.php:148 msgid "Message filtering" msgstr "" -#: ../user/edit_forum_preferences_form.php:165 +#: ../user/edit_forum_preferences_form.php:164 msgid "Filtered users" msgstr "" -#: ../user/edit_forum_preferences_form.php:166 +#: ../user/edit_forum_preferences_form.php:165 msgid "Ignore message board posts and private messages from these users." msgstr "" -#: ../user/edit_forum_preferences_form.php:168 +#: ../user/edit_forum_preferences_form.php:167 msgid "User ID (For instance: 123456789)" msgstr "" -#: ../user/edit_forum_preferences_form.php:169 ../user/pm.php:251 +#: ../user/edit_forum_preferences_form.php:168 ../user/pm.php:251 msgid "Add user to filter" msgstr "" -#: ../user/edit_forum_preferences_form.php:174 +#: ../user/edit_forum_preferences_form.php:173 msgid "Click here to update preferences" msgstr "" -#: ../user/edit_forum_preferences_form.php:176 -#: ../user/edit_forum_preferences_form.php:178 +#: ../user/edit_forum_preferences_form.php:175 +#: ../user/edit_forum_preferences_form.php:177 msgid "Reset" msgstr "" -#: ../user/edit_forum_preferences_form.php:177 +#: ../user/edit_forum_preferences_form.php:176 msgid "Or click here to reset preferences to the defaults" msgstr "" @@ -3480,67 +3482,67 @@ msgstr "" msgid "This message board is available as an %1RSS feed%2" msgstr "" -#: ../user/forum_forum.php:172 +#: ../user/forum_forum.php:174 msgid "This thread is hidden" msgstr "" -#: ../user/forum_forum.php:176 +#: ../user/forum_forum.php:178 msgid "This thread is sticky and locked, and you haven't read it yet" msgstr "" -#: ../user/forum_forum.php:176 +#: ../user/forum_forum.php:178 msgid "sticky/locked/unread" msgstr "" -#: ../user/forum_forum.php:178 +#: ../user/forum_forum.php:180 msgid "This thread is sticky and you haven't read it yet" msgstr "" -#: ../user/forum_forum.php:178 +#: ../user/forum_forum.php:180 msgid "sticky/unread" msgstr "" -#: ../user/forum_forum.php:182 +#: ../user/forum_forum.php:184 msgid "You haven't read this thread yet, and it's locked" msgstr "" -#: ../user/forum_forum.php:182 +#: ../user/forum_forum.php:184 msgid "unread/locked" msgstr "" -#: ../user/forum_forum.php:184 +#: ../user/forum_forum.php:186 msgid "You haven't read this thread yet" msgstr "" -#: ../user/forum_forum.php:190 +#: ../user/forum_forum.php:192 msgid "This thread is sticky and locked" msgstr "" -#: ../user/forum_forum.php:190 +#: ../user/forum_forum.php:192 msgid "sticky/locked" msgstr "" -#: ../user/forum_forum.php:192 +#: ../user/forum_forum.php:194 msgid "This thread is sticky" msgstr "" -#: ../user/forum_forum.php:192 +#: ../user/forum_forum.php:194 msgid "sticky" msgstr "" -#: ../user/forum_forum.php:196 +#: ../user/forum_forum.php:198 msgid "This thread is locked" msgstr "" -#: ../user/forum_forum.php:196 +#: ../user/forum_forum.php:198 msgid "locked" msgstr "" -#: ../user/forum_forum.php:198 +#: ../user/forum_forum.php:200 msgid "You read this thread" msgstr "" -#: ../user/forum_forum.php:198 +#: ../user/forum_forum.php:200 msgid "read" msgstr "" @@ -3641,7 +3643,7 @@ msgid "Optional explanation %1 This is included in email to user.%2" msgstr "" #: ../user/forum_moderate_post.php:101 ../user/forum_moderate_thread.php:91 -#: ../user/forum_post.php:130 ../user/forum_report_post.php:84 +#: ../user/forum_post.php:130 ../user/forum_report_post.php:85 #: ../user/forum_rss.php:55 ../user/friend.php:81 ../user/get_passwd.php:41 #: ../user/get_passwd.php:75 msgid "OK" @@ -3750,8 +3752,8 @@ msgid "You have already rated this post." msgstr "" #: ../user/forum_rate.php:62 ../user/forum_rate.php:78 -#: ../user/forum_rate.php:83 ../user/forum_report_post.php:68 -#: ../user/forum_report_post.php:93 ../user/forum_subscribe.php:54 +#: ../user/forum_rate.php:83 ../user/forum_report_post.php:69 +#: ../user/forum_report_post.php:94 ../user/forum_subscribe.php:54 #: ../user/forum_subscribe.php:69 ../user/forum_thread_status.php:51 msgid "Return to thread" msgstr "" @@ -3776,30 +3778,30 @@ msgstr "" msgid "Vote Submission Problem" msgstr "" -#: ../user/forum_reply.php:76 +#: ../user/forum_reply.php:73 msgid "" "Your post has been flagged as spam by the Akismet anti-spam system. Please " "modify your text and try again." msgstr "" -#: ../user/forum_reply.php:87 ../user/forum_thread.php:154 -#: ../user/forum_thread.php:274 +#: ../user/forum_reply.php:88 ../user/forum_thread.php:156 +#: ../user/forum_thread.php:272 msgid "Post to thread" msgstr "" -#: ../user/forum_reply.php:127 +#: ../user/forum_reply.php:137 msgid "Message:" msgstr "" -#: ../user/forum_reply.php:130 +#: ../user/forum_reply.php:140 msgid "reply to %1Message ID%2:" msgstr "" -#: ../user/forum_reply.php:154 +#: ../user/forum_reply.php:166 msgid "Post reply" msgstr "" -#: ../user/forum_reply.php:157 +#: ../user/forum_reply.php:169 msgid "Add my signature to this reply" msgstr "" @@ -3807,51 +3809,51 @@ msgstr "" msgid "You need more average or total credit to report a post." msgstr "" -#: ../user/forum_report_post.php:64 +#: ../user/forum_report_post.php:65 msgid "Report Registered" msgstr "" -#: ../user/forum_report_post.php:65 -msgid "Your report has been recorded. Thanks you for your input." +#: ../user/forum_report_post.php:66 +msgid "Your report has been recorded. Thanks for your input." msgstr "" -#: ../user/forum_report_post.php:66 +#: ../user/forum_report_post.php:67 msgid "" "A moderator will now look at your report and decide what will happen - this " "may take a little while, so please be patient" msgstr "" -#: ../user/forum_report_post.php:70 +#: ../user/forum_report_post.php:71 msgid "Report a forum post" msgstr "" -#: ../user/forum_report_post.php:72 +#: ../user/forum_report_post.php:73 msgid "" "Before reporting this post, consider using the +/- rating system instead. If " "enough users rate a post negatively it will eventually be hidden.
    You " "can find the rating system at the bottom of the post." msgstr "" -#: ../user/forum_report_post.php:79 +#: ../user/forum_report_post.php:80 msgid "Report post" msgstr "" -#: ../user/forum_report_post.php:80 +#: ../user/forum_report_post.php:81 msgid "" "Why do you find the post offensive: %1Please include enough information so " "that a person that\n" "has not yet read the thread will quickly be able to identify the issue.%2" msgstr "" -#: ../user/forum_report_post.php:89 +#: ../user/forum_report_post.php:90 msgid "Report not registered" msgstr "" -#: ../user/forum_report_post.php:90 +#: ../user/forum_report_post.php:91 msgid "Your report could not be recorded. Please wait a while and try again." msgstr "" -#: ../user/forum_report_post.php:91 +#: ../user/forum_report_post.php:92 msgid "" "If this is not a temporary error, please report it to the project developers." msgstr "" @@ -4024,107 +4026,107 @@ msgstr "" msgid "This thread has been hidden by moderators." msgstr "" -#: ../user/forum_thread.php:125 +#: ../user/forum_thread.php:127 msgid "My question was answered" msgstr "" -#: ../user/forum_thread.php:126 +#: ../user/forum_thread.php:128 msgid "Click here if your question has been adequately answered" msgstr "" -#: ../user/forum_thread.php:134 +#: ../user/forum_thread.php:136 msgid "I've also got this question" msgstr "" -#: ../user/forum_thread.php:155 ../user/forum_thread.php:275 +#: ../user/forum_thread.php:157 ../user/forum_thread.php:273 msgid "Add a new message to this thread" msgstr "" -#: ../user/forum_thread.php:167 +#: ../user/forum_thread.php:169 msgid "Unsubscribe" msgstr "" -#: ../user/forum_thread.php:168 +#: ../user/forum_thread.php:170 msgid "You are subscribed to this thread. Click here to unsubscribe." msgstr "" -#: ../user/forum_thread.php:174 +#: ../user/forum_thread.php:176 msgid "Subscribe" msgstr "" -#: ../user/forum_thread.php:175 +#: ../user/forum_thread.php:177 msgid "Click to get email when there are new posts in this thread" msgstr "" -#: ../user/forum_thread.php:186 +#: ../user/forum_thread.php:188 msgid "Unhide this thread" msgstr "" -#: ../user/forum_thread.php:192 +#: ../user/forum_thread.php:194 msgid "Hide this thread" msgstr "" -#: ../user/forum_thread.php:198 +#: ../user/forum_thread.php:200 msgid "Make unsticky" msgstr "" -#: ../user/forum_thread.php:199 +#: ../user/forum_thread.php:201 msgid "Make this thread not sticky" msgstr "" -#: ../user/forum_thread.php:204 +#: ../user/forum_thread.php:206 msgid "Make sticky" msgstr "" -#: ../user/forum_thread.php:205 +#: ../user/forum_thread.php:207 msgid "Make this thread sticky" msgstr "" -#: ../user/forum_thread.php:211 +#: ../user/forum_thread.php:213 msgid "Unlock" msgstr "" -#: ../user/forum_thread.php:212 +#: ../user/forum_thread.php:214 msgid "Unlock this thread" msgstr "" -#: ../user/forum_thread.php:217 +#: ../user/forum_thread.php:219 msgid "Lock" msgstr "" -#: ../user/forum_thread.php:218 +#: ../user/forum_thread.php:220 msgid "Lock this thread" msgstr "" -#: ../user/forum_thread.php:225 +#: ../user/forum_thread.php:227 msgid "Move this thread to a different forum" msgstr "" -#: ../user/forum_thread.php:230 +#: ../user/forum_thread.php:232 msgid "Edit title" msgstr "" -#: ../user/forum_thread.php:231 +#: ../user/forum_thread.php:233 msgid "Edit thread title" msgstr "" -#: ../user/forum_thread.php:241 +#: ../user/forum_thread.php:243 msgid "Export as Notice" msgstr "" -#: ../user/forum_thread.php:242 +#: ../user/forum_thread.php:244 msgid "Export this news item as a Notice" msgstr "" -#: ../user/forum_thread.php:247 +#: ../user/forum_thread.php:249 msgid "Don't export" msgstr "" -#: ../user/forum_thread.php:248 +#: ../user/forum_thread.php:250 msgid "Don't export this news item as a Notice" msgstr "" -#: ../user/forum_thread.php:256 ../user/forum_thread.php:258 +#: ../user/forum_thread.php:258 ../user/forum_thread.php:260 msgid "Sort" msgstr "" @@ -4352,7 +4354,7 @@ msgstr "" msgid "If you have not already done so, %1download BOINC client software%2." msgstr "" -#: ../user/home.php:49 ../project.sample/project.inc:46 +#: ../user/home.php:49 ../project.sample/project.inc:47 msgid "Your account" msgstr "" @@ -4368,39 +4370,39 @@ msgstr "" msgid "anonymous platform" msgstr "" -#: ../user/host_app_versions.php:43 +#: ../user/host_app_versions.php:42 msgid "Missing app version" msgstr "" -#: ../user/host_app_versions.php:45 +#: ../user/host_app_versions.php:44 msgid "Missing app" msgstr "" -#: ../user/host_app_versions.php:47 +#: ../user/host_app_versions.php:46 msgid "Missing platform" msgstr "" -#: ../user/host_app_versions.php:56 +#: ../user/host_app_versions.php:55 msgid "Number of tasks completed" msgstr "" -#: ../user/host_app_versions.php:57 +#: ../user/host_app_versions.php:56 msgid "Max tasks per day" msgstr "" -#: ../user/host_app_versions.php:58 +#: ../user/host_app_versions.php:57 msgid "Number of tasks today" msgstr "" -#: ../user/host_app_versions.php:59 +#: ../user/host_app_versions.php:58 msgid "Consecutive valid tasks" msgstr "" -#: ../user/host_app_versions.php:63 +#: ../user/host_app_versions.php:62 msgid "Average processing rate" msgstr "" -#: ../user/host_app_versions.php:72 +#: ../user/host_app_versions.php:71 msgid "Application details for host %1" msgstr "" @@ -4980,13 +4982,20 @@ msgstr "" msgid "Unknown action" msgstr "" -#: ../user/prefs.php:36 +#: ../user/prefs.php:35 msgid "" "Your preferences have been updated, and\n" " will take effect when your computer communicates with %1\n" " or you issue the %2Update%3 command from the BOINC Manager." msgstr "" +#: ../user/prefs.php:44 +msgid "" +"Your preferences have been reset to the defaults, and\n" +" will take effect when your computer communicates with %1\n" +" or you issue the %2Update%3 command from the BOINC Manager." +msgstr "" + #: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93 msgid "%1 for %2" msgstr "" @@ -6140,87 +6149,83 @@ msgstr "" msgid "User of the Day for %1: %2" msgstr "" -#: ../user/user_search.php:103 ../user/user_search.php:152 -msgid "User search results" -msgstr "" - -#: ../user/user_search.php:105 ../user/user_search.php:163 -msgid "Joined" -msgstr "" - -#: ../user/user_search.php:117 -msgid "Search type" -msgstr "" - -#: ../user/user_search.php:118 -msgid "User name starts with" -msgstr "" - -#: ../user/user_search.php:119 -msgid "Decreasing sign-up time" -msgstr "" - -#: ../user/user_search.php:120 -msgid "Decreasing average credit" -msgstr "" - -#: ../user/user_search.php:121 -msgid "Decreasing total credit" -msgstr "" - -#: ../user/user_search.php:122 +#: ../user/user_search.php:51 msgid "Filters" msgstr "" -#: ../user/user_search.php:123 +#: ../user/user_search.php:52 +msgid "User name starts with" +msgstr "" + +#: ../user/user_search.php:53 msgid "Any" msgstr "" -#: ../user/user_search.php:126 +#: ../user/user_search.php:56 msgid "With profile?" msgstr "" -#: ../user/user_search.php:127 ../user/user_search.php:132 +#: ../user/user_search.php:57 ../user/user_search.php:62 msgid "Either" msgstr "" -#: ../user/user_search.php:131 +#: ../user/user_search.php:61 msgid "On a team?" msgstr "" -#: ../user/user_search.php:150 +#: ../user/user_search.php:66 +msgid "Ordering" +msgstr "" + +#: ../user/user_search.php:67 +msgid "Decreasing sign-up time" +msgstr "" + +#: ../user/user_search.php:68 +msgid "Decreasing average credit" +msgstr "" + +#: ../user/user_search.php:69 +msgid "Decreasing total credit" +msgstr "" + +#: ../user/user_search.php:100 msgid "search string must be at least 3 characters" msgstr "" -#: ../user/user_search.php:161 -msgid "User names starting with" +#: ../user/user_search.php:133 +msgid "User search results" msgstr "" -#: ../user/user_search.php:171 +#: ../user/user_search.php:140 +msgid "Joined" +msgstr "" + +#: ../user/user_search.php:148 msgid "No users match your search criteria." msgstr "" -#: ../user/userw.php:45 +#: ../user/userw.php:35 msgid "User not found!" msgstr "" -#: ../user/userw.php:51 +#: ../user/userw.php:44 msgid "Account Data
    for %1
    Time:" msgstr "" -#: ../user/userw.php:54 +#: ../user/userw.php:47 msgid "Team:" msgstr "" -#: ../user/userw.php:55 +#: ../user/userw.php:48 msgid "Team TotCred:" msgstr "" -#: ../user/userw.php:56 +#: ../user/userw.php:49 msgid "Team AvgCred:" msgstr "" -#: ../user/userw.php:58 +#: ../user/userw.php:51 msgid "Team: None" msgstr "" @@ -6264,50 +6269,60 @@ msgstr "" msgid "The email address of your account has been validated." msgstr "" -#: ../user/view_profile.php:29 +#: ../user/view_profile.php:36 msgid "This user has no profile" msgstr "" -#: ../user/view_profile.php:46 +#: ../user/view_profile.php:54 msgid "Profile: %1" msgstr "" -#: ../user/view_profile.php:55 +#: ../user/view_profile.php:63 msgid "Account data" msgstr "" -#: ../user/weak_auth.php:50 -msgid "" -"Your 'weak account key' lets you link a computer to your account without " -"giving it the ability to log in to your account or to change it in any way." -msgstr "" - #: ../user/weak_auth.php:52 msgid "" -"This mechanism works only with projects that have upgraded their server " -"software 7 Dec 2007 or later." -msgstr "" - -#: ../user/weak_auth.php:54 -msgid "Your weak account key for this project is:" +"You can access your account either by using your email address and " +"password,\n" +" or by using an assigned 'account key'.\n" +" Your account key is:" msgstr "" #: ../user/weak_auth.php:57 -msgid "" -"To use your weak account key on a given host, find or create the 'account " -"file' for this project. This file has a name of the form " -"account_PROJECT_URL.xml. The account file for %1 is %2." +msgid "This key can be used to:" msgstr "" #: ../user/weak_auth.php:59 -msgid "Create this file if needed. Set its contents to:" +msgid "log in to your account on the web" msgstr "" -#: ../user/weak_auth.php:68 +#: ../user/weak_auth.php:61 msgid "" -"Your weak account key is a function of your password. If you change your " -"password, your weak account key changes, and your previous weak account key " -"becomes invalid." +"to attach a computer to your account without using the BOINC Manager.\n" +" To do so, install BOINC,\n" +" create a file named %1 in the BOINC\n" +" data directory, and set its contents to:" +msgstr "" + +#: ../user/weak_auth.php:73 +msgid "Weak account key" +msgstr "" + +#: ../user/weak_auth.php:74 +msgid "" +"Your 'weak account key' can be used to attach computers to your account\n" +" as described above, but cannot be used to log in to your account or " +"change it in any way.\n" +" If you want to attach untrusted or insecure computers to your account,\n" +" do so using your weak account key.\n" +" Your weak account key is:" +msgstr "" + +#: ../user/weak_auth.php:81 +msgid "" +"If you change your password, your weak account key changes, and your " +"previous weak account key becomes invalid." msgstr "" #: ../user/workunit.php:32 @@ -6350,33 +6365,37 @@ msgstr "" msgid "validation" msgstr "" -#: ../project.sample/project.inc:46 +#: ../user/workunit.php:67 +msgid "Pending" +msgstr "" + +#: ../project.sample/project.inc:47 msgid "Main page" msgstr "" -#: ../project.sample/project.inc:48 +#: ../project.sample/project.inc:49 msgid "Copyright" msgstr "" -#: ../project.sample/project.inc:51 +#: ../project.sample/project.inc:52 msgid "Generated" msgstr "" -#: ../project.sample/project.inc:82 +#: ../project.sample/project.inc:83 msgid "Your personal background." msgstr "" -#: ../project.sample/project.inc:86 +#: ../project.sample/project.inc:87 msgid "" "Tell us about yourself. You could tell us where you're from, your age, " "occupation, hobbies, or anything else about yourself." msgstr "" -#: ../project.sample/project.inc:90 +#: ../project.sample/project.inc:91 msgid "Your opinions about %1" msgstr "" -#: ../project.sample/project.inc:94 +#: ../project.sample/project.inc:95 msgid "" "Tell us your thoughts about %1
      \n" "
    1. Why do you run %1?\n" @@ -6403,6 +6422,6 @@ msgid "" "applications?" msgstr "" -#: ../project.sample/project_specific_prefs.inc:81 +#: ../project.sample/project_specific_prefs.inc:91 msgid "(all applications)" msgstr ""