[boinc] 01/04: Imported Upstream version 7.6.12+dfsg
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Oct 6 17:53:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository boinc.
commit a269173ae894658b85ad3ca819ba2b01e6db978e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Oct 6 19:30:23 2015 +0200
Imported Upstream version 7.6.12+dfsg
---
android/BOINC/AndroidManifest.xml | 4 +-
client/client_state.cpp | 59 +--
client/client_state.h | 1 +
client/cs_prefs.cpp | 20 +-
client/cs_proxy.cpp | 2 +
client/gpu_nvidia.cpp | 2 +
client/hostinfo_unix.cpp | 56 ++-
client/work_fetch.cpp | 13 +-
clientgui/DlgItemProperties.cpp | 16 +-
clientgui/MainDocument.cpp | 13 +-
clientgui/MainDocument.h | 7 +-
clientgui/ViewProjects.cpp | 44 +-
clientgui/ViewProjects.h | 10 +-
clientgui/ViewStatistics.cpp | 10 +-
clientgui/ViewTransfers.cpp | 18 +-
clientgui/ViewTransfers.h | 6 +-
clientgui/ViewWork.cpp | 38 +-
clientgui/ViewWork.h | 16 +-
clientgui/sg_ProjectPanel.cpp | 2 +-
clientgui/sg_TaskPanel.cpp | 2 +-
clientscr/mac_saver_module.cpp | 34 +-
configure.ac | 2 +-
lib/str_util.cpp | 50 +-
lib/str_util.h | 2 +-
locale/de/BOINC-Manager.mo | Bin 80193 -> 80540 bytes
locale/de/BOINC-Manager.po | 375 ++++++++-------
locale/fr/BOINC-Manager.mo | Bin 81360 -> 81684 bytes
locale/fr/BOINC-Manager.po | 385 +++++++--------
locale/ja/BOINC-Manager.mo | Bin 91465 -> 91709 bytes
locale/ja/BOINC-Manager.po | 957 +++++++++++++++++++-------------------
locale/pl/BOINC-Client.mo | Bin 4824 -> 4810 bytes
locale/pl/BOINC-Client.po | 15 +-
locale/zh_CN/BOINC-Drupal.po | 557 +++++++++++++++-------
locale/zh_CN/BOINC-Manager.mo | Bin 73346 -> 73720 bytes
locale/zh_CN/BOINC-Manager.po | 382 ++++++++-------
version.log | 2 +-
36 files changed, 1693 insertions(+), 1407 deletions(-)
diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index 95a74e0..fb9655c 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.berkeley.boinc"
android:installLocation="internalOnly"
- android:versionCode="125"
- android:versionName="7.6.11" > <!-- installation on SD card would break boot receiver -->
+ android:versionCode="126"
+ android:versionName="7.6.12" > <!-- installation on SD card would break boot receiver -->
<!-- Add Google Play store metadata informing the store we can run on tablets and other large screen devices -->
diff --git a/client/client_state.cpp b/client/client_state.cpp
index d1ae0d3..951d175 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -349,6 +349,34 @@ void CLIENT_STATE::set_now() {
now = x;
}
+// Check if version or platform has changed;
+// if so we're running a different client than before.
+//
+bool CLIENT_STATE::is_new_client() {
+ bool new_client = false;
+ if ((core_client_version.major != old_major_version)
+ || (core_client_version.minor != old_minor_version)
+ || (core_client_version.release != old_release)
+ ) {
+ msg_printf(NULL, MSG_INFO,
+ "Version change (%d.%d.%d -> %d.%d.%d)",
+ old_major_version, old_minor_version, old_release,
+ core_client_version.major,
+ core_client_version.minor,
+ core_client_version.release
+ );
+ new_client = true;
+ }
+ if (statefile_platform_name.size() && strcmp(get_primary_platform(), statefile_platform_name.c_str())) {
+ msg_printf(NULL, MSG_INFO,
+ "Platform changed from %s to %s",
+ statefile_platform_name.c_str(), get_primary_platform()
+ );
+ new_client = true;
+ }
+ return new_client;
+}
+
int CLIENT_STATE::init() {
int retval;
unsigned int i;
@@ -506,6 +534,8 @@ int CLIENT_STATE::init() {
//
parse_state_file();
+ bool new_client = is_new_client();
+
// this follows parse_state_file() since we need to have read
// domain_name for Android
//
@@ -590,31 +620,6 @@ int CLIENT_STATE::init() {
}
do_cmdline_actions();
- // check if version or platform has changed.
- // Either of these is evidence that we're running a different
- // client than previously.
- //
- bool new_client = false;
- if ((core_client_version.major != old_major_version)
- || (core_client_version.minor != old_minor_version)
- || (core_client_version.release != old_release)
- ) {
- msg_printf(NULL, MSG_INFO,
- "Version change (%d.%d.%d -> %d.%d.%d)",
- old_major_version, old_minor_version, old_release,
- core_client_version.major,
- core_client_version.minor,
- core_client_version.release
- );
- new_client = true;
- }
- if (statefile_platform_name.size() && strcmp(get_primary_platform(), statefile_platform_name.c_str())) {
- msg_printf(NULL, MSG_INFO,
- "Platform changed from %s to %s",
- statefile_platform_name.c_str(), get_primary_platform()
- );
- new_client = true;
- }
// if new version of client,
// - run CPU benchmarks
// - get new project list
@@ -2178,8 +2183,8 @@ void CLIENT_STATE::log_show_projects() {
strcpy(buf, "not assigned yet");
}
msg_printf(p, MSG_INFO,
- "URL %s; Computer ID %s; resource share %s",
- p->master_url, buf, comma_print(p->resource_share, 0).c_str()
+ "URL %s; Computer ID %s; resource share %.0f",
+ p->master_url, buf, p->resource_share
);
if (p->ended) {
msg_printf(p, MSG_INFO, "Project has ended - OK to detach");
diff --git a/client/client_state.h b/client/client_state.h
index a0550cb..cf03397 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -247,6 +247,7 @@ struct CLIENT_STATE {
// --------------- client_state.cpp:
CLIENT_STATE();
void show_host_info();
+ bool is_new_client();
int init();
bool poll_slow_events();
// Never blocks.
diff --git a/client/cs_prefs.cpp b/client/cs_prefs.cpp
index d40df9f..3b2b75c 100644
--- a/client/cs_prefs.cpp
+++ b/client/cs_prefs.cpp
@@ -654,18 +654,18 @@ void CLIENT_STATE::read_global_prefs(
msg_printf(NULL, MSG_INFO, "Preferences:");
msg_printf(NULL, MSG_INFO,
- " max memory usage when active: %sMB",
- comma_print((host_info.m_nbytes*global_prefs.ram_max_used_busy_frac)/MEGA, 2).c_str()
+ " max memory usage when active: %.2fMB",
+ (host_info.m_nbytes*global_prefs.ram_max_used_busy_frac)/MEGA
);
msg_printf(NULL, MSG_INFO,
- " max memory usage when idle: %sMB",
- comma_print((host_info.m_nbytes*global_prefs.ram_max_used_idle_frac)/MEGA, 2).c_str()
+ " max memory usage when idle: %.2fMB",
+ (host_info.m_nbytes*global_prefs.ram_max_used_idle_frac)/MEGA
);
#ifndef SIM
get_disk_usages();
msg_printf(NULL, MSG_INFO,
- " max disk usage: %sGB",
- comma_print(allowed_disk_usage(total_disk_usage)/GIGA, 2).c_str()
+ " max disk usage: %.2fGB",
+ allowed_disk_usage(total_disk_usage)/GIGA
);
#endif
// max_cpus, bandwidth limits may have changed
@@ -695,14 +695,14 @@ void CLIENT_STATE::read_global_prefs(
}
if (global_prefs.max_bytes_sec_down) {
msg_printf(NULL, MSG_INFO,
- " max download rate: %s bytes/sec",
- comma_print(global_prefs.max_bytes_sec_down, 0).c_str()
+ " max download rate: %.0f bytes/sec",
+ global_prefs.max_bytes_sec_down
);
}
if (global_prefs.max_bytes_sec_up) {
msg_printf(NULL, MSG_INFO,
- " max upload rate: %s bytes/sec",
- comma_print(global_prefs.max_bytes_sec_up, 0).c_str()
+ " max upload rate: %.0f bytes/sec",
+ global_prefs.max_bytes_sec_up, 0
);
}
#ifndef SIM
diff --git a/client/cs_proxy.cpp b/client/cs_proxy.cpp
index a5f2d5b..314ef45 100644
--- a/client/cs_proxy.cpp
+++ b/client/cs_proxy.cpp
@@ -55,9 +55,11 @@ static void show_proxy_info(PROXY_INFO& p) {
);
}
}
+#if 0
if (!p.use_http_proxy && !p.use_socks_proxy) {
msg_printf(NULL, MSG_INFO, "Not using a proxy");
}
+#endif
}
void select_proxy_info() {
diff --git a/client/gpu_nvidia.cpp b/client/gpu_nvidia.cpp
index 3612fcd..f1b34ba 100644
--- a/client/gpu_nvidia.cpp
+++ b/client/gpu_nvidia.cpp
@@ -75,6 +75,7 @@
// Suppress obsolete warning when building for OS 10.3.9
#define DLOPEN_NO_WARN
#include <mach-o/dyld.h>
+#include <Carbon/Carbon.h>
#endif
#include "config.h"
#include <dlfcn.h>
@@ -344,6 +345,7 @@ void COPROC_NVIDIA::get(
retval = (*__cuInit)(0);
#ifdef __APPLE__
if (!retval) break;
+ if (TickCount() > (120*60)) break; // Don't retry if system has been up for over 2 minutes
boinc_sleep(1.);
continue;
}
diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
index 6f0442e..7e47237 100644
--- a/client/hostinfo_unix.cpp
+++ b/client/hostinfo_unix.cpp
@@ -1224,33 +1224,47 @@ bool isDualGPUMacBook() {
// see if Virtualbox is installed
//
+static const struct dir_vbox_locations {
+ const char *dir;
+} vbox_locations[] = {
+ { "/usr/bin/VboxManage" },
+ { "/usr/local/bin/VboxManage" },
+ // add other ifdefs here as necessary.
+ { NULL },
+};
+
int HOST_INFO::get_virtualbox_version() {
char path[MAXPATHLEN];
char cmd [MAXPATHLEN+35];
char buf[256];
+ int i = 0;
FILE* fd;
- safe_strcpy(path, "/usr/bin/VBoxManage");
-
- if (boinc_file_exists(path)) {
- if (access(path, X_OK)) {
- return 0;
- }
- safe_strcpy(cmd, path);
- safe_strcat(cmd, " --version");
- fd = popen(cmd, "r");
- if (fd) {
- if (fgets(buf, sizeof(buf), fd)) {
- strip_whitespace(buf);
- int n, a,b,c;
- n = sscanf(buf, "%d.%d.%d", &a, &b, &c);
- if (n == 3) {
- strcpy(virtualbox_version, buf);
- }
- }
- pclose(fd);
- }
- }
+ do {
+ safe_strcpy(path, vbox_locations[i].dir);
+
+ if (boinc_file_exists(path)) {
+ if (access(path, X_OK)) {
+ return 0;
+ }
+ safe_strcpy(cmd, path);
+ safe_strcat(cmd, " --version");
+ fd = popen(cmd, "r");
+ if (fd) {
+ if (fgets(buf, sizeof(buf), fd)) {
+ strip_whitespace(buf);
+ int n, a,b,c;
+ n = sscanf(buf, "%d.%d.%d", &a, &b, &c);
+ if (n == 3) {
+ strcpy(virtualbox_version, buf);
+ }
+ }
+ pclose(fd);
+ }
+ }
+
+ ++i;
+ } while (vbox_locations[i].dir != NULL);
return 0;
}
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index 6f06c1e..8d37f20 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -910,12 +910,15 @@ void WORK_FETCH::handle_reply(
// since we don't have good runtime estimates yet
//
void WORK_FETCH::set_initial_work_request(PROJECT* p) {
+ clear_request();
for (int i=0; i<coprocs.n_rsc; i++) {
- rsc_work_fetch[i].req_secs = 1;
- if (i) {
- RSC_WORK_FETCH& rwf = rsc_work_fetch[i];
- if (rwf.ninstances == p->rsc_pwf[i].ncoprocs_excluded) {
- rsc_work_fetch[i].req_secs = 0;
+ if (p->resource_share > 0 && !p->dont_request_more_work) {
+ rsc_work_fetch[i].req_secs = 1;
+ if (i) {
+ RSC_WORK_FETCH& rwf = rsc_work_fetch[i];
+ if (rwf.ninstances == p->rsc_pwf[i].ncoprocs_excluded) {
+ rsc_work_fetch[i].req_secs = 0;
+ }
}
}
rsc_work_fetch[i].busy_time_estimator.reset();
diff --git a/clientgui/DlgItemProperties.cpp b/clientgui/DlgItemProperties.cpp
index 0bf6126..79bd587 100644
--- a/clientgui/DlgItemProperties.cpp
+++ b/clientgui/DlgItemProperties.cpp
@@ -252,7 +252,7 @@ void CDlgItemProperties::renderInfos(PROJECT* project_in) {
addProperty(_("URL"), wxString(project->master_url, wxConvUTF8));
addProperty(_("User name"), wxString(project->user_name.c_str(), wxConvUTF8));
addProperty(_("Team name"), wxString(project->team_name.c_str(), wxConvUTF8));
- addProperty(_("Resource share"), wxString::Format(wxT("%s"), comma_print(project->resource_share, 0).c_str()));
+ addProperty(_("Resource share"), wxString::Format(wxT("%s"), format_number(project->resource_share, 0)));
if (project->min_rpc_time > dtime()) {
addProperty(_("Scheduler RPC deferred for"), FormatTime(project->min_rpc_time - dtime()));
}
@@ -290,24 +290,24 @@ void CDlgItemProperties::renderInfos(PROJECT* project_in) {
if (project->ended) {
addProperty(_("Ended"), _("yes"));
}
- addProperty(_("Tasks completed"), wxString::Format(wxT("%s"), comma_print(project->njobs_success, 0).c_str()));
- addProperty(_("Tasks failed"), wxString::Format(wxT("%s"), comma_print(project->njobs_error, 0).c_str()));
+ addProperty(_("Tasks completed"), wxString::Format(wxT("%s"), format_number(project->njobs_success, 0)));
+ addProperty(_("Tasks failed"), wxString::Format(wxT("%s"), format_number(project->njobs_error, 0)));
addSection(_("Credit"));
addProperty(_("User"),
// Displays the average and total user credit
wxString::Format(
_("%s total, %s average"),
- comma_print(project->user_total_credit, 2).c_str(),
- comma_print(project->user_expavg_credit, 2).c_str()
+ format_number(project->user_total_credit, 0).c_str(),
+ format_number(project->user_expavg_credit, 2).c_str()
)
);
addProperty(_("Host"),
// Displays the average and total host credit
wxString::Format(
_("%s total, %s average"),
- comma_print(project->host_total_credit, 2).c_str(),
- comma_print(project->host_expavg_credit, 2).c_str()
+ format_number(project->host_total_credit, 0).c_str(),
+ format_number(project->host_expavg_credit, 2).c_str()
)
);
@@ -383,7 +383,7 @@ void CDlgItemProperties::renderInfos(RESULT* result) {
}
if (wup) {
addProperty(_("Estimated computation size"),
- wxString::Format(wxT("%s GFLOPs"), comma_print(wup->rsc_fpops_est/1e9, 0).c_str())
+ wxString::Format(wxT("%s GFLOPs"), format_number(wup->rsc_fpops_est/1e9, 0))
);
}
if (result->active_task) {
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 266f9be..c3d38f1 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -20,6 +20,7 @@
#endif
#include "stdwx.h"
+#include <wx/numformatter.h>
#include "error_numbers.h"
#include "util.h"
@@ -2629,8 +2630,8 @@ void color_cycle(int i, int n, wxColour& color) {
}
#ifdef __WXMSW__
-static float XDPIScaleFactor = 0.0;
-static float YDPIScaleFactor = 0.0;
+static double XDPIScaleFactor = 0.0;
+static double YDPIScaleFactor = 0.0;
void GetDPIScaling() {
XDPIScaleFactor = 1.0;
@@ -2650,14 +2651,14 @@ void GetDPIScaling() {
FreeLibrary(hUser32);
}
-float GetXDPIScaling() {
+double GetXDPIScaling() {
if (XDPIScaleFactor == 0.0) {
GetDPIScaling();
}
return XDPIScaleFactor;
}
-float GetYDPIScaling() {
+double GetYDPIScaling() {
if (YDPIScaleFactor == 0.0) {
GetDPIScaling();
}
@@ -2691,3 +2692,7 @@ wxString FormatTime(double secs) {
wxTimeSpan ts = wxTimeSpan(iHour, iMin, iSec);
return ts.Format((secs>=86400)?"%Dd %H:%M:%S":"%H:%M:%S");
}
+
+wxString format_number(double x, int nprec) {
+ return wxNumberFormatter::ToString(x, nprec);
+}
diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h
index 9651c0a..3b88571 100644
--- a/clientgui/MainDocument.h
+++ b/clientgui/MainDocument.h
@@ -225,7 +225,7 @@ public:
int CachedProjectStatusUpdate(bool bForce = false);
PROJECT* project(unsigned int);
PROJECT* project(char* url);
- float m_fProjectTotalResourceShare;
+ double m_fProjectTotalResourceShare;
int GetProjectCount();
@@ -421,14 +421,15 @@ extern wxString FormatTime(double secs);
#ifdef __WXMSW__
#define ADJUSTFORXDPI(x) (int)(x * GetXDPIScaling())
#define ADJUSTFORYDPI(y) (int)(y * GetYDPIScaling())
-extern float GetXDPIScaling();
-extern float GetYDPIScaling();
+extern double GetXDPIScaling();
+extern double GetYDPIScaling();
#else
#define ADJUSTFORXDPI(x) x
#define ADJUSTFORYDPI(y) y
#endif
wxBitmap GetScaledBitmapFromXPMData(const char** XPMData);
+wxString format_number(double x, int nprec);
#ifdef SANDBOX
#define BOINC_MASTER_GROUP_NAME "boinc_master"
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index c67a57e..59265e3 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -73,10 +73,10 @@ static int DefaultShownColumns[] = { COLUMN_PROJECT, COLUMN_ACCOUNTNAME, COLUMN_
#define BTN_PROPERTIES 5
static void format_total_credit(double credit, wxString& strBuffer) {
- strBuffer = wxString(comma_print(credit, 0).c_str(), wxConvUTF8);
+ strBuffer = format_number(credit, 0);
}
-static void format_avg_credit(float credit, wxString& strBuffer) {
- strBuffer = wxString(comma_print(credit, 2).c_str(), wxConvUTF8);
+static void format_avg_credit(double credit, wxString& strBuffer) {
+ strBuffer = format_number(credit, 2);
}
CProject::CProject() {
@@ -869,8 +869,8 @@ void CViewProjects::UpdateSelection() {
bool CViewProjects::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnIndex) {
wxString strDocumentText = wxEmptyString;
wxString strDocumentText2 = wxEmptyString;
- float fDocumentFloat = 0.0;
- float fDocumentPercent = 0.0;
+ double x = 0.0;
+ double fDocumentPercent = 0.0;
CProject* project;
bool dirty = false;
@@ -907,25 +907,25 @@ bool CViewProjects::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnIndex
}
break;
case COLUMN_TOTALCREDIT:
- GetDocTotalCredit(m_iSortedIndexes[iRowIndex], fDocumentFloat);
- if (fDocumentFloat != project->m_fTotalCredit) {
- project->m_fTotalCredit = fDocumentFloat;
- format_total_credit(fDocumentFloat, project->m_strTotalCredit);
+ GetDocTotalCredit(m_iSortedIndexes[iRowIndex], x);
+ if (x != project->m_fTotalCredit) {
+ project->m_fTotalCredit = x;
+ format_total_credit(x, project->m_strTotalCredit);
return true;
}
break;
case COLUMN_AVGCREDIT:
- GetDocAVGCredit(m_iSortedIndexes[iRowIndex], fDocumentFloat);
- if (fDocumentFloat != project->m_fAVGCredit) {
- project->m_fAVGCredit = fDocumentFloat;
- format_avg_credit(fDocumentFloat, project->m_strAVGCredit);
+ GetDocAVGCredit(m_iSortedIndexes[iRowIndex], x);
+ if (x != project->m_fAVGCredit) {
+ project->m_fAVGCredit = x;
+ format_avg_credit(x, project->m_strAVGCredit);
return true;
}
break;
case COLUMN_RESOURCESHARE:
- GetDocResourceShare(m_iSortedIndexes[iRowIndex], fDocumentFloat);
- if (fDocumentFloat != project->m_fResourceShare) {
- project->m_fResourceShare = fDocumentFloat;
+ GetDocResourceShare(m_iSortedIndexes[iRowIndex], x);
+ if (x != project->m_fResourceShare) {
+ project->m_fResourceShare = x;
dirty = true;
}
GetDocResourcePercent(m_iSortedIndexes[iRowIndex], fDocumentPercent);
@@ -934,7 +934,7 @@ bool CViewProjects::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnIndex
dirty = true;
}
if (dirty) {
- FormatResourceShare(fDocumentFloat, fDocumentPercent, project->m_strResourceShare);
+ FormatResourceShare(x, fDocumentPercent, project->m_strResourceShare);
return true;
}
break;
@@ -1057,7 +1057,7 @@ wxInt32 CViewProjects::FormatTeamName(wxInt32 item, wxString& strBuffer) const {
}
-void CViewProjects::GetDocTotalCredit(wxInt32 item, float& fBuffer) const {
+void CViewProjects::GetDocTotalCredit(wxInt32 item, double& fBuffer) const {
PROJECT* project = NULL;
CMainDocument* pDoc = wxGetApp().GetDocument();
@@ -1073,7 +1073,7 @@ void CViewProjects::GetDocTotalCredit(wxInt32 item, float& fBuffer) const {
}
-void CViewProjects::GetDocAVGCredit(wxInt32 item, float& fBuffer) const {
+void CViewProjects::GetDocAVGCredit(wxInt32 item, double& fBuffer) const {
PROJECT* project = NULL;
CMainDocument* pDoc = wxGetApp().GetDocument();
@@ -1088,7 +1088,7 @@ void CViewProjects::GetDocAVGCredit(wxInt32 item, float& fBuffer) const {
}
}
-void CViewProjects::GetDocResourceShare(wxInt32 item, float& fBuffer) const {
+void CViewProjects::GetDocResourceShare(wxInt32 item, double& fBuffer) const {
PROJECT* project = NULL;
CMainDocument* pDoc = wxGetApp().GetDocument();
@@ -1104,7 +1104,7 @@ void CViewProjects::GetDocResourceShare(wxInt32 item, float& fBuffer) const {
}
-void CViewProjects::GetDocResourcePercent(wxInt32 item, float& fBuffer) const {
+void CViewProjects::GetDocResourcePercent(wxInt32 item, double& fBuffer) const {
PROJECT* project = NULL;
CMainDocument* pDoc = wxGetApp().GetDocument();
@@ -1120,7 +1120,7 @@ void CViewProjects::GetDocResourcePercent(wxInt32 item, float& fBuffer) const {
}
-wxInt32 CViewProjects::FormatResourceShare(float fBuffer, float fBufferPercent, wxString& strBuffer) const {
+wxInt32 CViewProjects::FormatResourceShare(double fBuffer, double fBufferPercent, wxString& strBuffer) const {
strBuffer.Printf(wxT("%0.0f (%0.2f%%)"), fBuffer, fBufferPercent);
return 0;
diff --git a/clientgui/ViewProjects.h b/clientgui/ViewProjects.h
index 55d6ffd..2391b58 100644
--- a/clientgui/ViewProjects.h
+++ b/clientgui/ViewProjects.h
@@ -98,11 +98,11 @@ protected:
wxInt32 FormatAccountName( wxInt32 item, wxString& strBuffer ) const;
void GetDocTeamName(wxInt32 item, wxString& strBuffer) const;
wxInt32 FormatTeamName( wxInt32 item, wxString& strBuffer ) const;
- void GetDocTotalCredit(wxInt32 item, float& fBuffer) const;
- void GetDocAVGCredit(wxInt32 item, float& fBuffer) const;
- void GetDocResourceShare(wxInt32 item, float& fBuffer) const;
- void GetDocResourcePercent(wxInt32 item, float& fBuffer) const;
- wxInt32 FormatResourceShare( float fBuffer, float fBufferPercent, wxString& strBuffer ) const;
+ void GetDocTotalCredit(wxInt32 item, double& fBuffer) const;
+ void GetDocAVGCredit(wxInt32 item, double& fBuffer) const;
+ void GetDocResourceShare(wxInt32 item, double& fBuffer) const;
+ void GetDocResourcePercent(wxInt32 item, double& fBuffer) const;
+ wxInt32 FormatResourceShare( double fBuffer, double fBufferPercent, wxString& strBuffer ) const;
void GetDocStatus(wxInt32 item, wxString& strBuffer) const;
wxInt32 FormatStatus( wxInt32 item, wxString& strBuffer ) const;
void GetDocProjectURL(wxInt32 item, wxString& strBuffer) const;
diff --git a/clientgui/ViewStatistics.cpp b/clientgui/ViewStatistics.cpp
index 62d1bc6..6706d84 100644
--- a/clientgui/ViewStatistics.cpp
+++ b/clientgui/ViewStatistics.cpp
@@ -662,8 +662,8 @@ void CPaintStatistics::DrawAxis(wxDC &dc, const double max_val_y, const double m
wxCoord w_temp, h_temp, des_temp, lead_temp;
wxCoord w_temp2;
- dc.GetTextExtent(wxString::Format(wxT(" %s"), comma_print(max_val_y_all, 2).c_str()), &w_temp, &h_temp, &des_temp, &lead_temp);
- dc.GetTextExtent(wxString::Format(wxT(" %s"), comma_print(min_val_y_all, 2).c_str()), &w_temp2, &h_temp, &des_temp, &lead_temp);
+ dc.GetTextExtent(wxString::Format(wxT(" %s"), format_number(max_val_y_all, 2)), &w_temp, &h_temp, &des_temp, &lead_temp);
+ dc.GetTextExtent(wxString::Format(wxT(" %s"), format_number(min_val_y_all, 2)), &w_temp2, &h_temp, &des_temp, &lead_temp);
if (w_temp < w_temp2) w_temp = w_temp2;
@@ -740,7 +740,7 @@ void CPaintStatistics::DrawAxis(wxDC &dc, const double max_val_y, const double m
d_oy_count = (int)floor((max_val_y - y_start_val) / d_oy_val);
for (double ny = 0; ny <= double(d_oy_count); ++ny){
- dc.GetTextExtent(wxString::Format(wxT("%s"), comma_print(y_start_val + ny * d_oy_val, 2).c_str()), &w_temp, &h_temp, &des_temp, &lead_temp);
+ dc.GetTextExtent(wxString::Format(wxT("%s"), format_number(y_start_val + ny * d_oy_val, 2)), &w_temp, &h_temp, &des_temp, &lead_temp);
x0 = wxCoord(m_Graph_X_start + 1.0);
y0 = wxCoord(m_Ay_ValToCoord * (y_start_val + ny * d_oy_val) + m_By_ValToCoord);
x1 = wxCoord(m_Graph_X_end - 1.0);
@@ -753,7 +753,7 @@ void CPaintStatistics::DrawAxis(wxDC &dc, const double max_val_y, const double m
y0 = wxCoord(m_Ay_ValToCoord * (y_start_val + ny * d_oy_val) + m_By_ValToCoord - double(h_temp) / 2.0);
if (x0 < 0) x0 = 0;
if (y0 < 0) y0 = 0;
- dc.DrawText(wxString::Format(wxT("%s"), comma_print(y_start_val + ny * d_oy_val, 2).c_str()), x0, y0);
+ dc.DrawText(wxString::Format(wxT("%s"), format_number(y_start_val + ny * d_oy_val, 2)), x0, y0);
}
}
@@ -1108,7 +1108,7 @@ void CPaintStatistics::DrawMarker(wxDC &dc) {
if (y0 < 0) y0 = 0;
dc.SetTextForeground (m_pen_AxisYTextColour);
- dc.DrawText(wxString::Format(wxT("%s"), comma_print(m_GraphMarker_Y1, 2).c_str()) , x0, y00);
+ dc.DrawText(wxString::Format(wxT("%s"), format_number(m_GraphMarker_Y1, 2)) , x0, y00);
dc.SetTextForeground (m_pen_AxisXTextColour);
dc.DrawText(strBuffer1 ,x00, y0);
dc.SetBackgroundMode(wxTRANSPARENT);
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index f220f3e..5e5264f 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -570,7 +570,7 @@ void CViewTransfers::UpdateSelection() {
bool CViewTransfers::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnIndex) {
wxString strDocumentText = wxEmptyString;
wxString strDocumentText2 = wxEmptyString;
- float fDocumentFloat = 0.0;
+ double x = 0.0;
double fDocumentDouble = 0.0, fDocumentDouble2 = 0.0;
CTransfer* transfer;
bool bNeedRefresh = false;
@@ -601,10 +601,10 @@ bool CViewTransfers::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnInde
}
break;
case COLUMN_PROGRESS:
- GetDocProgress(m_iSortedIndexes[iRowIndex], fDocumentFloat);
- if (fDocumentFloat != transfer->m_fProgress) {
- transfer->m_fProgress = fDocumentFloat;
- FormatProgress(fDocumentFloat, transfer->m_strProgress);
+ GetDocProgress(m_iSortedIndexes[iRowIndex], x);
+ if (x != transfer->m_fProgress) {
+ transfer->m_fProgress = x;
+ FormatProgress(x, transfer->m_strProgress);
bNeedRefresh = true;
}
break;
@@ -681,9 +681,9 @@ void CViewTransfers::GetDocFileName(wxInt32 item, wxString& strBuffer) const {
}
-void CViewTransfers::GetDocProgress(wxInt32 item, float& fBuffer) const {
- float fBytesSent = 0;
- float fFileSize = 0;
+void CViewTransfers::GetDocProgress(wxInt32 item, double& fBuffer) const {
+ double fBytesSent = 0;
+ double fFileSize = 0;
FILE_TRANSFER* transfer = NULL;
CMainDocument* pDoc = wxGetApp().GetDocument();
@@ -710,7 +710,7 @@ void CViewTransfers::GetDocProgress(wxInt32 item, float& fBuffer) const {
}
-wxInt32 CViewTransfers::FormatProgress(float fBuffer, wxString& strBuffer) const {
+wxInt32 CViewTransfers::FormatProgress(double fBuffer, wxString& strBuffer) const {
strBuffer.Printf(wxT("%.2f%%"), fBuffer);
return 0;
}
diff --git a/clientgui/ViewTransfers.h b/clientgui/ViewTransfers.h
index 1998ae2..eff4699 100644
--- a/clientgui/ViewTransfers.h
+++ b/clientgui/ViewTransfers.h
@@ -33,7 +33,7 @@ public:
wxString m_strProjectName;
wxString m_strFileName;
- float m_fProgress;
+ double m_fProgress;
double m_fBytesXferred;
double m_fTotalBytes;
double m_dTime;
@@ -89,8 +89,8 @@ protected:
void GetDocProjectName(wxInt32 item, wxString& strBuffer) const;
void GetDocFileName(wxInt32 item, wxString& strBuffer) const;
- void GetDocProgress(wxInt32 item, float& fBuffer) const;
- wxInt32 FormatProgress( float fBuffer, wxString& strBuffer ) const;
+ void GetDocProgress(wxInt32 item, double& fBuffer) const;
+ wxInt32 FormatProgress( double fBuffer, wxString& strBuffer ) const;
void GetDocBytesXferred(wxInt32 item, double& fBuffer) const;
void GetDocTotalBytes(wxInt32 item, double& fBuffer) const;
wxInt32 FormatSize( double fBytesSent, double fFileSize, wxString& strBuffer ) const;
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index d4e0814..9c09c14 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -977,7 +977,7 @@ void CViewWork::UpdateSelection() {
bool CViewWork::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnIndex) {
wxString strDocumentText = wxEmptyString;
wxString strDocumentText2 = wxEmptyString;
- float fDocumentFloat = 0.0;
+ double x = 0.0;
time_t tDocumentTime = (time_t)0;
CWork* work;
@@ -1014,26 +1014,26 @@ bool CViewWork::SynchronizeCacheItem(wxInt32 iRowIndex, wxInt32 iColumnIndex) {
}
break;
case COLUMN_CPUTIME:
- GetDocCPUTime(m_iSortedIndexes[iRowIndex], fDocumentFloat);
- if (fDocumentFloat != work->m_fCPUTime) {
- work->m_fCPUTime = fDocumentFloat;
- FormatCPUTime(fDocumentFloat, work->m_strCPUTime);
+ GetDocCPUTime(m_iSortedIndexes[iRowIndex], x);
+ if (x != work->m_fCPUTime) {
+ work->m_fCPUTime = x;
+ FormatCPUTime(x, work->m_strCPUTime);
return true;
}
break;
case COLUMN_PROGRESS:
- GetDocProgress(m_iSortedIndexes[iRowIndex], fDocumentFloat);
- if (fDocumentFloat != work->m_fProgress) {
- work->m_fProgress = fDocumentFloat;
- FormatProgress(fDocumentFloat, work->m_strProgress);
+ GetDocProgress(m_iSortedIndexes[iRowIndex], x);
+ if (x != work->m_fProgress) {
+ work->m_fProgress = x;
+ FormatProgress(x, work->m_strProgress);
return true;
}
break;
case COLUMN_TOCOMPLETION:
- GetDocTimeToCompletion(m_iSortedIndexes[iRowIndex], fDocumentFloat);
- if (fDocumentFloat != work->m_fTimeToCompletion) {
- work->m_fTimeToCompletion = fDocumentFloat;
- work->m_strTimeToCompletion = FormatTime(fDocumentFloat);
+ GetDocTimeToCompletion(m_iSortedIndexes[iRowIndex], x);
+ if (x != work->m_fTimeToCompletion) {
+ work->m_fTimeToCompletion = x;
+ work->m_strTimeToCompletion = FormatTime(x);
return true;
}
break;
@@ -1141,7 +1141,7 @@ void CViewWork::GetDocName(wxInt32 item, wxString& strBuffer) const {
}
-void CViewWork::GetDocCPUTime(wxInt32 item, float& fBuffer) const {
+void CViewWork::GetDocCPUTime(wxInt32 item, double& fBuffer) const {
RESULT* result = wxGetApp().GetDocument()->result(item);
fBuffer = 0;
@@ -1161,7 +1161,7 @@ void CViewWork::GetDocCPUTime(wxInt32 item, float& fBuffer) const {
}
-wxInt32 CViewWork::FormatCPUTime(float fBuffer, wxString& strBuffer) const {
+wxInt32 CViewWork::FormatCPUTime(double fBuffer, wxString& strBuffer) const {
wxInt32 iHour = 0;
wxInt32 iMin = 0;
wxInt32 iSec = 0;
@@ -1183,7 +1183,7 @@ wxInt32 CViewWork::FormatCPUTime(float fBuffer, wxString& strBuffer) const {
}
-void CViewWork::GetDocProgress(wxInt32 item, float& fBuffer) const {
+void CViewWork::GetDocProgress(wxInt32 item, double& fBuffer) const {
RESULT* result = wxGetApp().GetDocument()->result(item);
fBuffer = 0;
@@ -1201,14 +1201,14 @@ void CViewWork::GetDocProgress(wxInt32 item, float& fBuffer) const {
}
-wxInt32 CViewWork::FormatProgress(float fBuffer, wxString& strBuffer) const {
+wxInt32 CViewWork::FormatProgress(double fBuffer, wxString& strBuffer) const {
strBuffer.Printf(wxT("%.3f%%"), fBuffer);
return 0;
}
-void CViewWork::GetDocTimeToCompletion(wxInt32 item, float& fBuffer) const {
+void CViewWork::GetDocTimeToCompletion(wxInt32 item, double& fBuffer) const {
RESULT* result = wxGetApp().GetDocument()->result(item);
fBuffer = 0;
@@ -1276,7 +1276,7 @@ void CViewWork::GetDocProjectURL(wxInt32 item, wxString& strBuffer) const {
double CViewWork::GetProgressValue(long item) {
- float fBuffer = 0;
+ double fBuffer = 0;
RESULT* result = wxGetApp().GetDocument()->result(m_iSortedIndexes[item]);
if (result) {
diff --git a/clientgui/ViewWork.h b/clientgui/ViewWork.h
index 519e2ad..2de6b6a 100644
--- a/clientgui/ViewWork.h
+++ b/clientgui/ViewWork.h
@@ -35,9 +35,9 @@ public:
wxString m_strProjectName;
wxString m_strApplicationName;
wxString m_strName;
- float m_fCPUTime;
- float m_fProgress;
- float m_fTimeToCompletion;
+ double m_fCPUTime;
+ double m_fProgress;
+ double m_fTimeToCompletion;
time_t m_tReportDeadline;
wxString m_strStatus;
wxString m_strProjectURL; // Used internally, not displayed
@@ -102,11 +102,11 @@ protected:
void GetDocProjectName(wxInt32 item, wxString& strBuffer) const;
void GetDocApplicationName(wxInt32 item, wxString& strBuffer) const;
void GetDocName(wxInt32 item, wxString& strBuffer) const;
- void GetDocCPUTime(wxInt32 item, float& fBuffer) const;
- wxInt32 FormatCPUTime( float fBuffer, wxString& strBuffer ) const;
- void GetDocProgress(wxInt32 item, float& fBuffer) const;
- wxInt32 FormatProgress( float fBuffer, wxString& strBuffer ) const;
- void GetDocTimeToCompletion(wxInt32 item, float& fBuffer) const;
+ void GetDocCPUTime(wxInt32 item, double& fBuffer) const;
+ wxInt32 FormatCPUTime( double fBuffer, wxString& strBuffer ) const;
+ void GetDocProgress(wxInt32 item, double& fBuffer) const;
+ wxInt32 FormatProgress( double fBuffer, wxString& strBuffer ) const;
+ void GetDocTimeToCompletion(wxInt32 item, double& fBuffer) const;
void GetDocReportDeadline(wxInt32 item, time_t& time) const;
wxInt32 FormatReportDeadline( time_t deadline, wxString& strBuffer ) const;
wxInt32 FormatStatus( wxInt32 item, wxString& strBuffer ) const;
diff --git a/clientgui/sg_ProjectPanel.cpp b/clientgui/sg_ProjectPanel.cpp
index cb3d449..38ccf9e 100644
--- a/clientgui/sg_ProjectPanel.cpp
+++ b/clientgui/sg_ProjectPanel.cpp
@@ -269,7 +269,7 @@ void CSimpleProjectPanel::UpdateInterface() {
if (m_fDisplayedCredit != project->user_total_credit) {
str.Printf(wxT("%s: %s"),
m_sTotalWorkDoneString.c_str(),
- comma_print(project->user_total_credit, 0).c_str()
+ format_number(project->user_total_credit, 0)
);
UpdateStaticText(&m_TotalCreditValue, str);
m_TotalCreditValue->SetName(str); // For accessibility on Windows
diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp
index 6596816..aca12c1 100644
--- a/clientgui/sg_TaskPanel.cpp
+++ b/clientgui/sg_TaskPanel.cpp
@@ -712,7 +712,7 @@ void CSimpleTaskPanel::UpdatePanel(bool delayShow) {
m_SlideShowArea->AdvanceSlideShow(false, true);
m_bStableTaskInfoChanged = false;
}
- float f = result->elapsed_time;
+ double f = result->elapsed_time;
if (f == 0.) f = result->current_cpu_time;
// f = result->final_elapsed_time;
UpdateStaticText(&m_ElapsedTimeValue, GetElapsedTimeString(f));
diff --git a/clientscr/mac_saver_module.cpp b/clientscr/mac_saver_module.cpp
index 8006038..a9618f3 100644
--- a/clientscr/mac_saver_module.cpp
+++ b/clientscr/mac_saver_module.cpp
@@ -370,22 +370,26 @@ OSStatus CScreensaver::initBOINCApp() {
if (++retryCount > 3) // Limit to 3 relaunches to prevent thrashing
return -1;
-#ifdef _DEBUG
- err = -1;
-#else
- err = GetpathToBOINCManagerApp(boincPath, sizeof(boincPath));
-#endif
- if (err)
- { // If we couldn't find BOINCManager.app, try default path
- strcpy(boincPath, "/Applications/");
- if (brandId)
- strcat(boincPath, m_BrandText);
- else
- strcat(boincPath, "BOINCManager");
- strcat(boincPath, ".app");
+ // Find boinc client within BOINCManager.app
+ // First, try default path
+ strcpy(boincPath, "/Applications/");
+ if (brandId) {
+ strcat(boincPath, m_BrandText);
+ } else {
+ strcat(boincPath, "BOINCManager");
+ }
+ strcat(boincPath, ".app/Contents/Resources/boinc");
+
+ // If not at default path, search for it by creator code and bundle identifier
+ if (!boinc_file_exists(boincPath)) {
+ err = GetpathToBOINCManagerApp(boincPath, sizeof(boincPath));
+ if (err) {
+ saverState = SaverState_CantLaunchCoreClient;
+ return err;
+ } else {
+ strcat(boincPath, "/Contents/Resources/boinc");
+ }
}
-
- strcat(boincPath, "/Contents/Resources/boinc");
if ( (myPid = fork()) < 0)
return -1;
diff --git a/configure.ac b/configure.ac
index 6ac01e9..bc88e36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
-AC_INIT(BOINC, 7.6.11)
+AC_INIT(BOINC, 7.6.12)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
diff --git a/lib/str_util.cpp b/lib/str_util.cpp
index 3492656..1f7f7c2 100644
--- a/lib/str_util.cpp
+++ b/lib/str_util.cpp
@@ -755,52 +755,4 @@ vector<string> split(string s, char delim) {
result.push_back(item);
}
return result;
-}
-
-// convert number to string with thousands separators.
-// If nfrac is nonzero, following with fractional digits
-//
-string comma_print(double x, int nfrac) {
- static char comma = 0, decimal_point;
- static char retbuf[30];
- char *p = &retbuf[sizeof(retbuf)-1];
- int i = 0;
-
- if (!comma) {
- struct lconv *lcp = localeconv();
- if (lcp) {
- if (lcp->thousands_sep != NULL && *lcp->thousands_sep) {
- comma = *lcp->thousands_sep;
- decimal_point = *lcp->decimal_point;
- } else {
- comma = ',';
- decimal_point = '.';
- }
- }
- }
-
- *p = 0;
-
- unsigned long n = (unsigned long) x;
-
- // do fractional part if requested
- //
- if (nfrac) {
- double frac = x - n;
- p -= nfrac+1;
- sprintf(p, "%.*f", nfrac, frac);
- p++; // skip 0
- *p = decimal_point;
- }
-
- do {
- if (i%3 == 0 && i != 0) {
- *--p = comma;
- }
- *--p = '0' + n % 10;
- n /= 10;
- i++;
- } while (n);
-
- return string(p);
-}
+}
\ No newline at end of file
diff --git a/lib/str_util.h b/lib/str_util.h
index f03cf88..410d695 100644
--- a/lib/str_util.h
+++ b/lib/str_util.h
@@ -101,5 +101,5 @@ extern const char* batch_state_string(int state);
extern void strip_translation(char* p);
extern std::vector<std::string> split(std::string, char delim);
-extern std::string comma_print(double, int);
+
#endif
diff --git a/locale/de/BOINC-Manager.mo b/locale/de/BOINC-Manager.mo
index 45c0004..a7e1e2e 100644
Binary files a/locale/de/BOINC-Manager.mo and b/locale/de/BOINC-Manager.mo differ
diff --git a/locale/de/BOINC-Manager.po b/locale/de/BOINC-Manager.po
index 61a8097..44735a6 100644
--- a/locale/de/BOINC-Manager.po
+++ b/locale/de/BOINC-Manager.po
@@ -5,6 +5,7 @@
# Translators:
# Christian Beer <christian.beer at posteo.de>, 2015
# Florian Heuer <f.a.heuer at gmail.com>, 2015
+# Jan Schladetzky <keiken at keiken.eu>, 2015
# JimsB <kai.erbstoesser at t-online.de>, 2015
# Haubi, 2015
# Markus Youssef <mk.kiri.youssef at gmail.com>, 2015
@@ -12,10 +13,10 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-23 18:52-0500\n"
-"PO-Revision-Date: 2015-07-31 09:34+0000\n"
+"POT-Creation-Date: 2015-08-24 17:05-0500\n"
+"PO-Revision-Date: 2015-09-09 13:06+0000\n"
"Last-Translator: Christian Beer <christian.beer at posteo.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/boinc/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/boinc/boinc/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -741,12 +742,12 @@ msgstr "%s ist augenblicklich nicht mit mit dem %s Client verbunden.\nBitte benu
msgid "Project web pages"
msgstr "Projekt-Webseite"
-#: clientgui/BOINCClientManager.cpp:573
+#: clientgui/BOINCClientManager.cpp:545
#, c-format
msgid "%s - Unexpected Exit"
msgstr "%s - Unerwartetes Ende"
-#: clientgui/BOINCClientManager.cpp:583
+#: clientgui/BOINCClientManager.cpp:555
#, c-format
msgid ""
"The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -797,7 +798,7 @@ msgstr "%s hat die Internetverbindung erfolgreich beendet."
msgid "%s failed to disconnected from the Internet."
msgstr "%s konnte die Internetverbindung nicht beenden."
-#: clientgui/BOINCGUIApp.cpp:351
+#: clientgui/BOINCGUIApp.cpp:356
#, c-format
msgid ""
"You currently are not authorized to manage the client.\n"
@@ -810,90 +811,94 @@ msgid ""
" user group."
msgstr "Sie sind momentan nicht befugt diesen Client zu verwalten.\n\nUm %s mit dem aktuellen Nutzer auszuführen müssen Sie:\n - %s neu installieren und die Frage bezüglich\n \"non-administrative users\" mit \"Ja\" beantworten\n oder\n - Ihren Administrator kontaktieren damit Sie in die\n Benutzergruppe 'boinc_master' aufgenommen werden."
-#: clientgui/BOINCGUIApp.cpp:357
+#: clientgui/BOINCGUIApp.cpp:362
#, c-format
msgid ""
"%s ownership or permissions are not set properly; please reinstall %s.\n"
"(Error code %d"
msgstr "Der Besitzstatus oder die Berechtigungen von %s sind nicht korrekt. Bitte installieren Sie %s neu.\n(Fehlercode %d"
-#: clientgui/BOINCGUIApp.cpp:363
+#: clientgui/BOINCGUIApp.cpp:368
msgid " at "
msgstr " bei "
-#: clientgui/BOINCGUIApp.cpp:366 clientgui/MainDocument.cpp:2494
-#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
+#: clientgui/BOINCGUIApp.cpp:371 clientgui/MainDocument.cpp:2495
+#: clientgui/MainDocument.cpp:2554 clientgui/ViewTransfers.cpp:887
msgid ")"
msgstr ")"
-#: clientgui/BOINCGUIApp.cpp:396
+#: clientgui/BOINCGUIApp.cpp:401
msgid ""
"A reboot is required in order for BOINC to run properly.\n"
"Please reboot your computer and try again."
msgstr "Ein Neustart ist erforderlich damit BOINC einwandfrei\nfunktioniert. Bitte starten sie den Computer neu und\nversuchen es erneut."
-#: clientgui/BOINCGUIApp.cpp:397 clientgui/DlgAbout.cpp:153
+#: clientgui/BOINCGUIApp.cpp:402 clientgui/DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "BOINC-Manager"
-#: clientgui/BOINCGUIApp.cpp:658
+#: clientgui/BOINCGUIApp.cpp:664
msgid "BOINC Manager was started by the operating system automatically"
msgstr "Der BOINC-Manager wurde automatisch vom Betriebssystem gestartet."
-#: clientgui/BOINCGUIApp.cpp:660
+#: clientgui/BOINCGUIApp.cpp:666
msgid "Startup BOINC so only the system tray icon is visible"
msgstr "Starte BOINC so, dass nur das Symbol im Infobereich der Taskleiste sichtbar ist."
-#: clientgui/BOINCGUIApp.cpp:662
+#: clientgui/BOINCGUIApp.cpp:668
msgid "Directory containing the BOINC Client executable"
msgstr "Verzeichnis der BOINC-Client Programmdateien"
-#: clientgui/BOINCGUIApp.cpp:663
+#: clientgui/BOINCGUIApp.cpp:669
msgid "BOINC data directory"
msgstr "Datenverzeichnis des BOINC-Client"
-#: clientgui/BOINCGUIApp.cpp:665
+#: clientgui/BOINCGUIApp.cpp:671
msgid "Host name or IP address"
msgstr "Rechnername oder IP-Adresse"
-#: clientgui/BOINCGUIApp.cpp:666
+#: clientgui/BOINCGUIApp.cpp:672
msgid "GUI RPC port number"
msgstr "GUI RPC Portnummer"
-#: clientgui/BOINCGUIApp.cpp:667
+#: clientgui/BOINCGUIApp.cpp:673
msgid "Password"
msgstr "Passwort"
-#: clientgui/BOINCGUIApp.cpp:668
+#: clientgui/BOINCGUIApp.cpp:674
msgid "Startup BOINC with these optional arguments"
msgstr "Starte BOINC mit diesen optionalen Argumenten"
-#: clientgui/BOINCGUIApp.cpp:669
+#: clientgui/BOINCGUIApp.cpp:675
msgid "disable BOINC security users and permissions"
msgstr "BOINC Sicherheit Benutzer und Rechte abschalten"
-#: clientgui/BOINCGUIApp.cpp:670
+#: clientgui/BOINCGUIApp.cpp:676
msgid "set skin debugging mode to enable skin manager error messages"
msgstr "Skin-Debugmodus einschalten um Skin-Manager Fehlermeldungen zu sehen"
-#: clientgui/BOINCGUIApp.cpp:671
+#: clientgui/BOINCGUIApp.cpp:677
msgid "multiple instances of BOINC Manager allowed"
msgstr "mehrere Instanzen des BOINC Managers erlauben"
-#: clientgui/BOINCGUIApp.cpp:673
+#: clientgui/BOINCGUIApp.cpp:679
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "Nicht verwendet: Workaround für den Fehler in XCode 4.2"
+#: clientgui/BOINCGUIApp.cpp:681
+msgid "Not run the daemon"
+msgstr "Dienst nicht starten."
+
#. These are just special tags so deal with them in a special way
-#: clientgui/BOINCGUIApp.cpp:920
+#: clientgui/BOINCGUIApp.cpp:931
msgid "(Automatic Detection)"
msgstr "(Automatische Erkennung)"
-#: clientgui/BOINCGUIApp.cpp:921
+#: clientgui/BOINCGUIApp.cpp:932
msgid "(Unknown)"
msgstr "(Unbekannt)"
-#: clientgui/BOINCGUIApp.cpp:922
+#: clientgui/BOINCGUIApp.cpp:933
msgid "(User Defined)"
msgstr "(Benutzerauswahl)"
@@ -921,7 +926,7 @@ msgstr "GPU pausieren"
msgid "E&xit"
msgstr "&Beenden"
-#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:806
+#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:808
#: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
#: clientgui/sg_ProjectCommandPopup.cpp:125
#: clientgui/sg_TaskCommandPopup.cpp:118
@@ -1079,7 +1084,7 @@ msgid "For more information, visit "
msgstr "Für mehr Informationen besuchen Sie"
#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:410
#: clientgui/DlgSelectComputer.cpp:163
msgid "&OK"
msgstr "&OK"
@@ -1104,19 +1109,23 @@ msgstr "Zahl muss zwischen 0 und 10 sein"
msgid "Number must be between 0 and 100"
msgstr "Zahl muss zwischen 0 und 100 sein"
-#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:847
+#: clientgui/DlgAdvPreferences.cpp:689
+msgid "Number must be between 1 and 100"
+msgstr "Zahl muss zwischen 0 und 100 liegen"
+
+#: clientgui/DlgAdvPreferences.cpp:947 clientgui/sg_DlgPreferences.cpp:847
msgid "invalid input value detected"
msgstr "Ungültiger Eingabewert entdeckt"
-#: clientgui/DlgAdvPreferences.cpp:958 clientgui/sg_DlgPreferences.cpp:849
+#: clientgui/DlgAdvPreferences.cpp:959 clientgui/sg_DlgPreferences.cpp:849
msgid "Validation Error"
msgstr "Gültigkeitsproblem"
-#: clientgui/DlgAdvPreferences.cpp:1170
+#: clientgui/DlgAdvPreferences.cpp:1171
msgid "Discard local preferences and use web-based preferences?"
msgstr "Lokale Einstellungen verwerfen und Web-basierte Einstellungen verwenden?"
-#: clientgui/DlgAdvPreferences.cpp:1171 clientgui/sg_DlgPreferences.cpp:1175
+#: clientgui/DlgAdvPreferences.cpp:1172 clientgui/sg_DlgPreferences.cpp:1175
msgid "Confirmation"
msgstr "Bestätigung"
@@ -1618,7 +1627,7 @@ msgstr "%s - Ereignisanzeige"
#. Create List Pane Items
#: clientgui/DlgEventLog.cpp:237 clientgui/ViewMessages.cpp:117
-#: clientgui/ViewProjects.cpp:253 clientgui/ViewStatistics.cpp:411
+#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:411
#: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
#: clientgui/ViewWork.cpp:260
msgid "Project"
@@ -1700,7 +1709,7 @@ msgid "Add an application to this list"
msgstr "Füge eine Anwendung zur dieser Liste hinzu"
#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
-#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:90
+#: clientgui/ViewProjects.cpp:234 clientgui/sg_ProjectCommandPopup.cpp:90
msgid "Remove"
msgstr "Entfernen"
@@ -1800,7 +1809,7 @@ msgid "Remember this decision and do not show this dialog."
msgstr "Diese Einstellung merken und den Dialog nicht wieder anzeigen."
#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/DlgOptions.cpp:415 clientgui/DlgSelectComputer.cpp:168
#: clientgui/wizardex.cpp:378
msgid "&Cancel"
msgstr "&Abbrechen"
@@ -1831,8 +1840,8 @@ msgstr "Standardeinstellungen bestätigen"
#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
-msgid "Don't fetch tasks for "
-msgstr "Keine Aufgaben mehr für "
+msgid "Don't request tasks for "
+msgstr "Keine Aufgabe anfordern für"
#: clientgui/DlgItemProperties.cpp:194
msgid "Project preference"
@@ -1852,12 +1861,12 @@ msgstr "Die Konfiguration des Clients schließt aus, dass"
#: clientgui/DlgItemProperties.cpp:209
#, c-format
-msgid "%s work fetch deferred for"
+msgid "%s task request deferred for"
msgstr "%s Aufgabenabruf verzögert für"
#: clientgui/DlgItemProperties.cpp:213
#, c-format
-msgid "%s work fetch deferral interval"
+msgid "%s task request deferral interval"
msgstr "Verzögerungsintervall für %s"
#. set dialog title
@@ -1866,7 +1875,7 @@ msgid "Properties of project "
msgstr "Projekteigenschaften "
#. layout controls
-#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:232
msgid "General"
msgstr "Allgemein"
@@ -1882,7 +1891,7 @@ msgstr "Benutzername"
msgid "Team name"
msgstr "Teamname"
-#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:258
+#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:260
msgid "Resource share"
msgstr "Ressourcenaufteilung"
@@ -1926,7 +1935,7 @@ msgid "no"
msgstr "Nein"
#: clientgui/DlgItemProperties.cpp:271
-msgid "Don't request more work"
+msgid "Don't request tasks"
msgstr "Keine weiteren Aufgaben anfordern"
#: clientgui/DlgItemProperties.cpp:273
@@ -2087,149 +2096,161 @@ msgstr "pro Minute"
msgid "per second"
msgstr "pro Sekunde"
-#: clientgui/DlgItemProperties.cpp:482 clientgui/ViewWork.cpp:1125
+#: clientgui/DlgItemProperties.cpp:419
+msgid "Executable"
+msgstr "Ausführbare Datei"
+
+#: clientgui/DlgItemProperties.cpp:485 clientgui/ViewWork.cpp:1125
#: clientgui/sg_TaskPanel.cpp:828
msgid "Local: "
msgstr "Lokal: "
-#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:130 clientgui/DlgOptions.cpp:136
msgid "Options"
msgstr "Optionen"
-#: clientgui/DlgOptions.cpp:178
+#: clientgui/DlgOptions.cpp:179
msgid "Language:"
msgstr "Sprache:"
-#: clientgui/DlgOptions.cpp:185
+#: clientgui/DlgOptions.cpp:186
msgid "What language should BOINC use?"
msgstr "Welche Sprache soll der BOINC Manager verwenden?"
-#: clientgui/DlgOptions.cpp:189
+#: clientgui/DlgOptions.cpp:190
msgid "Notice reminder interval:"
msgstr "An Nachrichten erinnern alle:"
-#: clientgui/DlgOptions.cpp:196
+#: clientgui/DlgOptions.cpp:197
msgid "How often should BOINC remind you of new notices?"
msgstr "Wie oft soll der BOINC Manager Sie erinnern wenn neue Nachrichten verfügbar sind?"
-#: clientgui/DlgOptions.cpp:201
+#: clientgui/DlgOptions.cpp:202
msgid "Run Manager at login?"
msgstr "Manager bei der Anmeldung starten?"
-#: clientgui/DlgOptions.cpp:207
+#: clientgui/DlgOptions.cpp:208
msgid "Run the BOINC Manager when you log on."
msgstr "Startet den BOINC-Manager wenn Sie sich anmelden."
-#: clientgui/DlgOptions.cpp:212
+#: clientgui/DlgOptions.cpp:213
+msgid "Run daemon?"
+msgstr "Als Dienst starten?"
+
+#: clientgui/DlgOptions.cpp:219
+msgid "Run daemon when launching the Manager."
+msgstr "Dienst starten wenn der Manager gestartet wird."
+
+#: clientgui/DlgOptions.cpp:223
msgid "Enable Manager exit dialog?"
msgstr "Ende-Dialog anzeigen?"
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgOptions.cpp:229
msgid "Display the exit dialog when shutting down the Manager."
msgstr "Zeigt den Ende-Dialog beim Verlassen des BOINC-Managers an."
-#: clientgui/DlgOptions.cpp:229
+#: clientgui/DlgOptions.cpp:240
msgid "Dial-up and Virtual Private Network settings"
msgstr "&Wähl- und Virtual Private Network Einstellungen"
-#: clientgui/DlgOptions.cpp:243
+#: clientgui/DlgOptions.cpp:254
msgid "&Set Default"
msgstr "Standard &festlegen"
-#: clientgui/DlgOptions.cpp:248
+#: clientgui/DlgOptions.cpp:259
msgid "&Clear Default"
msgstr "Standard &löschen"
-#: clientgui/DlgOptions.cpp:255
+#: clientgui/DlgOptions.cpp:266
msgid "Default Connection:"
msgstr "Standardverbindung:"
-#: clientgui/DlgOptions.cpp:262
+#: clientgui/DlgOptions.cpp:273
msgid "Connections"
msgstr "Verbindungen"
-#: clientgui/DlgOptions.cpp:271
+#: clientgui/DlgOptions.cpp:282
msgid "Connect via HTTP proxy server"
msgstr "Über HTTP Proxyserver verbinden"
-#: clientgui/DlgOptions.cpp:275
+#: clientgui/DlgOptions.cpp:286
msgid "HTTP Proxy Server Configuration"
msgstr "HTTP Proxyserver Konfiguration"
-#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:294 clientgui/DlgOptions.cpp:358
msgid "Address:"
msgstr "Adresse:"
-#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:302 clientgui/DlgOptions.cpp:366
#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
msgid "Port:"
msgstr "Port:"
-#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:310 clientgui/DlgOptions.cpp:374
msgid "Don't use proxy for:"
msgstr "Keinen Proxyserver benutzen für:"
-#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
msgid "Leave these blank if not needed"
msgstr "Bitte leer lassen, falls nicht benötigt."
-#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:323 clientgui/DlgOptions.cpp:387
#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
msgid "User Name:"
msgstr "Benutzername:"
-#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:331 clientgui/DlgOptions.cpp:395
#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
#: clientgui/ProxyPage.cpp:366
msgid "Password:"
msgstr "Passwort:"
-#: clientgui/DlgOptions.cpp:327
+#: clientgui/DlgOptions.cpp:338
msgid "HTTP Proxy"
msgstr "HTTP Proxyserver"
-#: clientgui/DlgOptions.cpp:335
+#: clientgui/DlgOptions.cpp:346
msgid "Connect via SOCKS proxy server"
msgstr "Über SOCKS Proxyserver verbinden"
-#: clientgui/DlgOptions.cpp:339
+#: clientgui/DlgOptions.cpp:350
msgid "SOCKS Proxy Server Configuration"
msgstr "SOCKS Proxyserver Konfiguration"
-#: clientgui/DlgOptions.cpp:391
+#: clientgui/DlgOptions.cpp:402
msgid "SOCKS Proxy"
msgstr "SOCKS Proxyserver"
-#: clientgui/DlgOptions.cpp:589
+#: clientgui/DlgOptions.cpp:600
msgid "always"
msgstr "ständig"
-#: clientgui/DlgOptions.cpp:590
+#: clientgui/DlgOptions.cpp:601
msgid "1 hour"
msgstr "1 Stunde"
-#: clientgui/DlgOptions.cpp:591
+#: clientgui/DlgOptions.cpp:602
msgid "6 hours"
msgstr "6 Stunden"
-#: clientgui/DlgOptions.cpp:592
+#: clientgui/DlgOptions.cpp:603
msgid "1 day"
msgstr "1 Tag"
-#: clientgui/DlgOptions.cpp:593
+#: clientgui/DlgOptions.cpp:604
msgid "1 week"
msgstr "1 Woche"
-#: clientgui/DlgOptions.cpp:594
+#: clientgui/DlgOptions.cpp:605
msgid "never"
msgstr "niemals"
-#: clientgui/DlgOptions.cpp:691
+#: clientgui/DlgOptions.cpp:703
#, c-format
msgid "%s - Language Selection"
msgstr "Sprachauswahl: %s"
-#: clientgui/DlgOptions.cpp:698
+#: clientgui/DlgOptions.cpp:710
#, c-format
msgid ""
"The %s's language has been changed. In order for this change to take "
@@ -2375,7 +2396,7 @@ msgid "The home page of the GEO-600 project"
msgstr "Die Homepage des GEO-600 Projektes"
#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
-#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:441
+#: clientgui/ViewProjects.cpp:257 clientgui/ViewStatistics.cpp:441
msgid "Team"
msgstr "Team"
@@ -2439,203 +2460,203 @@ msgstr "Forschung"
msgid "Learn about the projects hosted at World Community Grid"
msgstr "Erfahren Sie mehr über die auf World Community Grid gehosteten Projekte"
-#: clientgui/MainDocument.cpp:583
+#: clientgui/MainDocument.cpp:584
msgid "Starting client"
msgstr "Starte Client"
-#: clientgui/MainDocument.cpp:591
+#: clientgui/MainDocument.cpp:592
msgid "Connecting to client"
msgstr "Verbindung zum Client wird hergestellt."
-#: clientgui/MainDocument.cpp:1205
+#: clientgui/MainDocument.cpp:1206
msgid "Retrieving system state; please wait..."
msgstr "Ermittlung des BOINC-Systemstatus. Bitte etwas Geduld..."
-#: clientgui/MainDocument.cpp:1826
+#: clientgui/MainDocument.cpp:1827
msgid "Missing application"
msgstr "fehlende Anwendung"
-#: clientgui/MainDocument.cpp:1827
+#: clientgui/MainDocument.cpp:1828
msgid ""
"Please download and install the CoRD application from "
"http://cord.sourceforge.net"
msgstr "Bitte installieren Sie die CoRD Anwendung von http://cord.sourceforge.net"
-#: clientgui/MainDocument.cpp:2442
+#: clientgui/MainDocument.cpp:2443
msgid "on batteries"
msgstr "Batteriebetrieb"
-#: clientgui/MainDocument.cpp:2443
+#: clientgui/MainDocument.cpp:2444
msgid "computer is in use"
msgstr "Computer wird benutzt"
-#: clientgui/MainDocument.cpp:2444
+#: clientgui/MainDocument.cpp:2445
msgid "user request"
msgstr "Benutzergefordert"
-#: clientgui/MainDocument.cpp:2445
+#: clientgui/MainDocument.cpp:2446
msgid "time of day"
msgstr "Tageszeit"
-#: clientgui/MainDocument.cpp:2446
+#: clientgui/MainDocument.cpp:2447
msgid "CPU benchmarks in progress"
msgstr "CPU Benchmarks laufen"
-#: clientgui/MainDocument.cpp:2447
+#: clientgui/MainDocument.cpp:2448
msgid "need disk space - check preferences"
msgstr "Festplattenplatz benötigt - Einstellungen überprüfen"
-#: clientgui/MainDocument.cpp:2448
+#: clientgui/MainDocument.cpp:2449
msgid "computer is not in use"
msgstr "Computer wird nicht benutzt"
-#: clientgui/MainDocument.cpp:2449
+#: clientgui/MainDocument.cpp:2450
msgid "starting up"
msgstr "starte"
-#: clientgui/MainDocument.cpp:2450
+#: clientgui/MainDocument.cpp:2451
msgid "an exclusive app is running"
msgstr "eine Anwendung läuft exklusiv"
-#: clientgui/MainDocument.cpp:2451
+#: clientgui/MainDocument.cpp:2452
msgid "CPU is busy"
msgstr "CPU ist beschäftigt"
-#: clientgui/MainDocument.cpp:2452
+#: clientgui/MainDocument.cpp:2453
msgid "network bandwidth limit exceeded"
msgstr "Maximales Datenübertragungsvolumen überschritten"
-#: clientgui/MainDocument.cpp:2453
+#: clientgui/MainDocument.cpp:2454
msgid "requested by operating system"
msgstr "vom Betriebssystem angefordert"
-#: clientgui/MainDocument.cpp:2455
+#: clientgui/MainDocument.cpp:2456
msgid "unknown reason"
msgstr "Ursache unbekannt"
-#: clientgui/MainDocument.cpp:2477
+#: clientgui/MainDocument.cpp:2478
msgid "GPU missing, "
msgstr "GPU nicht gefunden, "
-#: clientgui/MainDocument.cpp:2484
+#: clientgui/MainDocument.cpp:2485
msgid "New"
msgstr "Neu"
-#: clientgui/MainDocument.cpp:2488
+#: clientgui/MainDocument.cpp:2489
msgid "Download failed"
msgstr "Herunterladen fehlgeschlagen"
-#: clientgui/MainDocument.cpp:2490
+#: clientgui/MainDocument.cpp:2491
msgid "Downloading"
msgstr "Am herunterladen"
-#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
+#: clientgui/MainDocument.cpp:2493 clientgui/MainDocument.cpp:2552
msgid " (suspended - "
msgstr " (angehalten - "
-#: clientgui/MainDocument.cpp:2500
+#: clientgui/MainDocument.cpp:2501
msgid "Project suspended by user"
msgstr "Projekt angehalten durch Benutzer"
-#: clientgui/MainDocument.cpp:2502
+#: clientgui/MainDocument.cpp:2503
msgid "Task suspended by user"
msgstr "Angehalten durch Benutzer"
#. an NCI process can be running even though computation is suspended
#. (because of <dont_suspend_nci>
-#: clientgui/MainDocument.cpp:2507
+#: clientgui/MainDocument.cpp:2508
msgid "Suspended - "
msgstr "Angehalten- "
-#: clientgui/MainDocument.cpp:2510
+#: clientgui/MainDocument.cpp:2511
msgid "GPU suspended - "
msgstr "GPU angehalten - "
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2515
msgid "Waiting for memory"
msgstr "Warten auf Speicher"
-#: clientgui/MainDocument.cpp:2516
+#: clientgui/MainDocument.cpp:2517
msgid "Waiting for shared memory"
msgstr "Warten auf geteilten Speicher"
-#: clientgui/MainDocument.cpp:2518
+#: clientgui/MainDocument.cpp:2519
msgid "Running"
msgstr "Aktiv"
-#: clientgui/MainDocument.cpp:2520
+#: clientgui/MainDocument.cpp:2521
msgid " (non-CPU-intensive)"
msgstr " (nicht CPU-intensiv)"
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2524
msgid "Waiting to run"
msgstr "Verdrängt"
-#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
+#: clientgui/MainDocument.cpp:2526 clientgui/MainDocument.cpp:2529
msgid "Ready to start"
msgstr "Zur Ausführung bereit"
-#: clientgui/MainDocument.cpp:2532
+#: clientgui/MainDocument.cpp:2533
msgid "Postponed: "
msgstr "Verschoben:"
-#: clientgui/MainDocument.cpp:2535
+#: clientgui/MainDocument.cpp:2536
msgid "Postponed"
msgstr "Verschoben"
-#: clientgui/MainDocument.cpp:2539
+#: clientgui/MainDocument.cpp:2540
msgid "Waiting for network access"
msgstr "Warte auf Netzwerkzugriffserlaubnis"
-#: clientgui/MainDocument.cpp:2543
+#: clientgui/MainDocument.cpp:2544
msgid "Computation error"
msgstr "Berechnungsfehler"
-#: clientgui/MainDocument.cpp:2547
+#: clientgui/MainDocument.cpp:2548
msgid "Upload failed"
msgstr "Hochladen fehlgeschlagen"
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2550
msgid "Uploading"
msgstr "Lädt hoch"
-#: clientgui/MainDocument.cpp:2560
+#: clientgui/MainDocument.cpp:2561
msgid "Aborted by user"
msgstr "Abgebrochen durch Benutzer"
-#: clientgui/MainDocument.cpp:2563
+#: clientgui/MainDocument.cpp:2564
msgid "Aborted by project"
msgstr "Abgebrochen durch das Projekt"
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2567
msgid "Aborted: not started by deadline"
msgstr "Abgebrochen: kein Start vor Stichtag möglich."
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2570
msgid "Aborted: task disk limit exceeded"
msgstr "Abgebrochen: Festplattenlimit der Aufgabe überschritten"
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2573
msgid "Aborted: run time limit exceeded"
msgstr "Abgebrochen: Laufzeitlimit überschritten"
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2576
msgid "Aborted: memory limit exceeded"
msgstr "Abgebrochen: Arbeitsspeicherlimit überschritten"
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2579
msgid "Aborted"
msgstr "Abgebrochen"
-#: clientgui/MainDocument.cpp:2583
+#: clientgui/MainDocument.cpp:2584
msgid "Acknowledged"
msgstr "Bestätigt"
-#: clientgui/MainDocument.cpp:2585
+#: clientgui/MainDocument.cpp:2586
msgid "Ready to report"
msgstr "Hochgeladen, meldebereit"
-#: clientgui/MainDocument.cpp:2587
+#: clientgui/MainDocument.cpp:2588
#, c-format
msgid "Error: invalid state '%d'"
msgstr "Fehler: Ungültiger Status '%d'"
@@ -2952,7 +2973,7 @@ msgid "'%s' does not contain a valid path."
msgstr "'%s' enhält keine zulässige Pfadangabe."
#. Setup View
-#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:200
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:202
#: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
#: clientgui/ViewWork.cpp:207
msgid "Commands"
@@ -3010,17 +3031,17 @@ msgstr "Es sind zur Zeit keine Nachrichten verfügbar."
msgid "Notices"
msgstr "Nachrichten"
-#: clientgui/ViewProjects.cpp:204 clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewProjects.cpp:206 clientgui/sg_ProjectCommandPopup.cpp:66
msgid "Update"
msgstr "Aktualisieren"
-#: clientgui/ViewProjects.cpp:205 clientgui/sg_ProjectCommandPopup.cpp:67
+#: clientgui/ViewProjects.cpp:207 clientgui/sg_ProjectCommandPopup.cpp:67
msgid ""
"Report all completed tasks, get latest credit, get latest preferences, and "
"possibly get more tasks."
msgstr "Berichtet über alle fertig gestellten Aufgaben des ausgewählten (markierten) Projekts, holt die letzten Statistiken und Einstellungen und erhält eventuell mehr Aufgaben."
-#: clientgui/ViewProjects.cpp:211 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:213 clientgui/ViewProjects.cpp:812
#: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
#: clientgui/sg_BoincSimpleFrame.cpp:893
#: clientgui/sg_ProjectCommandPopup.cpp:72
@@ -3029,196 +3050,196 @@ msgstr "Berichtet über alle fertig gestellten Aufgaben des ausgewählten (marki
msgid "Suspend"
msgstr "Anhalten"
-#: clientgui/ViewProjects.cpp:212 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:214 clientgui/ViewProjects.cpp:812
#: clientgui/sg_ProjectCommandPopup.cpp:73
#: clientgui/sg_ProjectCommandPopup.cpp:129
msgid "Suspend tasks for this project."
msgstr "Pausiert zeitweilig die Aufgaben des ausgewählten Projekts."
-#: clientgui/ViewProjects.cpp:218 clientgui/ViewProjects.cpp:829
+#: clientgui/ViewProjects.cpp:220 clientgui/ViewProjects.cpp:831
#: clientgui/sg_ProjectCommandPopup.cpp:78
#: clientgui/sg_ProjectCommandPopup.cpp:136
msgid "No new tasks"
msgstr "Keine neuen Aufgaben"
-#: clientgui/ViewProjects.cpp:219 clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:221 clientgui/sg_ProjectCommandPopup.cpp:79
msgid "Don't get new tasks for this project."
msgstr "Fordert keine neuen Aufgaben für das ausgewählte Projekt mehr an."
-#: clientgui/ViewProjects.cpp:225 clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:227 clientgui/sg_ProjectCommandPopup.cpp:84
msgid "Reset project"
msgstr "Zurücksetzen"
-#: clientgui/ViewProjects.cpp:226 clientgui/sg_ProjectCommandPopup.cpp:85
+#: clientgui/ViewProjects.cpp:228 clientgui/sg_ProjectCommandPopup.cpp:85
msgid ""
"Delete all files and tasks associated with this project, and get new tasks."
" You can update the project first to report any completed tasks."
msgstr "Entfernt alle Aufgaben und Anwendungen des ausgewählten Projekts von diesem Computer. Sie sollten das Projekt vorher aktualisieren um alle erledigten Aufgaben dem Server zu melden."
-#: clientgui/ViewProjects.cpp:233 clientgui/sg_ProjectCommandPopup.cpp:91
+#: clientgui/ViewProjects.cpp:235 clientgui/sg_ProjectCommandPopup.cpp:91
msgid ""
"Remove this project. Tasks in progress will be lost (use 'Update' first to "
"report any completed tasks)."
msgstr "Entfernt dieses Projekt von diesem Computer. Sie sollten vorher das Projekt aktualisieren um alle erledigten Aufgaben dem Server zu melden."
-#: clientgui/ViewProjects.cpp:239 clientgui/ViewWork.cpp:246
+#: clientgui/ViewProjects.cpp:241 clientgui/ViewWork.cpp:246
#: clientgui/sg_ProjectCommandPopup.cpp:96
#: clientgui/sg_TaskCommandPopup.cpp:84
msgid "Properties"
msgstr "Eigenschaften"
-#: clientgui/ViewProjects.cpp:240 clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:242 clientgui/sg_ProjectCommandPopup.cpp:97
msgid "Show project details."
msgstr "Zeige Projekt-Details."
-#: clientgui/ViewProjects.cpp:254 clientgui/ViewStatistics.cpp:426
+#: clientgui/ViewProjects.cpp:256 clientgui/ViewStatistics.cpp:426
msgid "Account"
msgstr "Konto"
-#: clientgui/ViewProjects.cpp:256
+#: clientgui/ViewProjects.cpp:258
msgid "Work done"
msgstr "Arbeit erledigt"
-#: clientgui/ViewProjects.cpp:257
+#: clientgui/ViewProjects.cpp:259
msgid "Avg. work done"
msgstr "Durchschn. geleistete Arbeit"
-#: clientgui/ViewProjects.cpp:259 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewProjects.cpp:261 clientgui/ViewTransfers.cpp:215
#: clientgui/ViewWork.cpp:262
msgid "Status"
msgstr "Status"
-#: clientgui/ViewProjects.cpp:338
+#: clientgui/ViewProjects.cpp:340
msgid "Projects"
msgstr "Projekte"
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:392
msgid "Updating project..."
msgstr "Projekt wird aktualisiert..."
-#: clientgui/ViewProjects.cpp:432
+#: clientgui/ViewProjects.cpp:434
msgid "Resuming project..."
msgstr "Projekt wird fortgesetzt..."
-#: clientgui/ViewProjects.cpp:436
+#: clientgui/ViewProjects.cpp:438
msgid "Suspending project..."
msgstr "Projekt wird angehalten..."
-#: clientgui/ViewProjects.cpp:473
+#: clientgui/ViewProjects.cpp:475
msgid "Telling project to allow additional task downloads..."
msgstr "Erlaubt dem Projekt neue Aufgaben anzufordern..."
-#: clientgui/ViewProjects.cpp:477
+#: clientgui/ViewProjects.cpp:479
msgid "Telling project to not fetch any additional tasks..."
msgstr "Verbietet dem Projekt neue Aufgaben anzufordern..."
-#: clientgui/ViewProjects.cpp:513
+#: clientgui/ViewProjects.cpp:515
msgid "Resetting project..."
msgstr "Projekt wird zurückgesetzt..."
-#: clientgui/ViewProjects.cpp:526 clientgui/sg_ProjectCommandPopup.cpp:229
+#: clientgui/ViewProjects.cpp:528 clientgui/sg_ProjectCommandPopup.cpp:229
#, c-format
msgid "Are you sure you want to reset project '%s'?"
msgstr "Wollen Sie das Projekt '%s' wirklich zurücksetzen?"
-#: clientgui/ViewProjects.cpp:532 clientgui/sg_ProjectCommandPopup.cpp:235
+#: clientgui/ViewProjects.cpp:534 clientgui/sg_ProjectCommandPopup.cpp:235
msgid "Reset Project"
msgstr "Projekt zurücksetzen"
-#: clientgui/ViewProjects.cpp:571
+#: clientgui/ViewProjects.cpp:573
msgid "Removing project..."
msgstr "Projekt wird entfernt..."
-#: clientgui/ViewProjects.cpp:584 clientgui/sg_ProjectCommandPopup.cpp:266
+#: clientgui/ViewProjects.cpp:586 clientgui/sg_ProjectCommandPopup.cpp:266
#, c-format
msgid "Are you sure you want to remove project '%s'?"
msgstr "Wollen Sie das Projekt '%s' wirklich entfernen?"
-#: clientgui/ViewProjects.cpp:590 clientgui/sg_ProjectCommandPopup.cpp:272
+#: clientgui/ViewProjects.cpp:592 clientgui/sg_ProjectCommandPopup.cpp:272
msgid "Remove Project"
msgstr "Projekt entfernen"
-#: clientgui/ViewProjects.cpp:631 clientgui/ViewWork.cpp:686
+#: clientgui/ViewProjects.cpp:633 clientgui/ViewWork.cpp:686
msgid "Launching browser..."
msgstr "Webbrowser wird gestartet..."
-#: clientgui/ViewProjects.cpp:806 clientgui/sg_ProjectCommandPopup.cpp:126
+#: clientgui/ViewProjects.cpp:808 clientgui/sg_ProjectCommandPopup.cpp:126
msgid "Resume tasks for this project."
msgstr "Setzt die pausierte Arbeit an dem ausgewählten Projekt fort."
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:133
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:133
msgid "Allow new tasks"
msgstr "Neue Aufgaben zulassen"
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:134
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:134
msgid "Allow fetching new tasks for this project."
msgstr "Erlaubt das Anfordern von neuen Aufgaben für das ausgewählte (markierte) Projekt."
-#: clientgui/ViewProjects.cpp:829 clientgui/sg_ProjectCommandPopup.cpp:137
+#: clientgui/ViewProjects.cpp:831 clientgui/sg_ProjectCommandPopup.cpp:137
msgid "Don't fetch new tasks for this project."
msgstr "Fordert keine neuen Aufgaben für das ausgewählte (markierte) Projekt mehr an."
-#: clientgui/ViewProjects.cpp:1133
+#: clientgui/ViewProjects.cpp:1135
msgid "Requested by user"
msgstr "Vom Benutzer angefragt"
-#: clientgui/ViewProjects.cpp:1134
+#: clientgui/ViewProjects.cpp:1136
msgid "To fetch work"
msgstr "Um Arbeit zu holen"
-#: clientgui/ViewProjects.cpp:1135
+#: clientgui/ViewProjects.cpp:1137
msgid "To report completed tasks"
msgstr "Um fertige Aufgaben zu melden"
-#: clientgui/ViewProjects.cpp:1136
+#: clientgui/ViewProjects.cpp:1138
msgid "To send trickle-up message"
msgstr "Um eine Zwischenmeldung zu senden"
-#: clientgui/ViewProjects.cpp:1137
+#: clientgui/ViewProjects.cpp:1139
msgid "Requested by account manager"
msgstr "Von der Kontenverwaltung angefordert"
-#: clientgui/ViewProjects.cpp:1138
+#: clientgui/ViewProjects.cpp:1140
msgid "Project initialization"
msgstr "Projektinitialisierung"
-#: clientgui/ViewProjects.cpp:1139
+#: clientgui/ViewProjects.cpp:1141
msgid "Requested by project"
msgstr "Vom Projekt angefordert"
-#: clientgui/ViewProjects.cpp:1140
+#: clientgui/ViewProjects.cpp:1142
msgid "Unknown reason"
msgstr "Unbekannte Ursache"
-#: clientgui/ViewProjects.cpp:1154
+#: clientgui/ViewProjects.cpp:1156
msgid "Suspended by user"
msgstr "Angehalten durch Benutzer"
-#: clientgui/ViewProjects.cpp:1157
+#: clientgui/ViewProjects.cpp:1159
msgid "Won't get new tasks"
msgstr "Erhält keine neue Aufgaben"
-#: clientgui/ViewProjects.cpp:1160
+#: clientgui/ViewProjects.cpp:1162
msgid "Project ended - OK to remove"
msgstr "Projekt beendet - Bereit zum entfernen"
-#: clientgui/ViewProjects.cpp:1163
+#: clientgui/ViewProjects.cpp:1165
msgid "Will remove when tasks done"
msgstr "Entfernen, sobald Aufgaben erledigt sind"
-#: clientgui/ViewProjects.cpp:1166
+#: clientgui/ViewProjects.cpp:1168
msgid "Scheduler request pending"
msgstr "Wartende Scheduleranfrage"
-#: clientgui/ViewProjects.cpp:1172
+#: clientgui/ViewProjects.cpp:1174
msgid "Scheduler request in progress"
msgstr "Laufende Scheduleranfrage"
-#: clientgui/ViewProjects.cpp:1175
+#: clientgui/ViewProjects.cpp:1177
msgid "Trickle up message pending"
msgstr "Zwischenmeldung ausstehend"
-#: clientgui/ViewProjects.cpp:1181
+#: clientgui/ViewProjects.cpp:1183
msgid "Communication deferred"
msgstr "Kommunikation verzögert"
diff --git a/locale/fr/BOINC-Manager.mo b/locale/fr/BOINC-Manager.mo
index 9be2120..243c668 100644
Binary files a/locale/fr/BOINC-Manager.mo and b/locale/fr/BOINC-Manager.mo differ
diff --git a/locale/fr/BOINC-Manager.po b/locale/fr/BOINC-Manager.po
index 0c8a0c9..c18138f 100644
--- a/locale/fr/BOINC-Manager.po
+++ b/locale/fr/BOINC-Manager.po
@@ -7,16 +7,17 @@
# Axelle Andy <andex at voila.fr>, 2015
# BUNS Nicolas, 2015
# Christian Beer <christian.beer at posteo.de>, 2015
+# Clément Jonglez <clement.jonglez at isae.fr>, 2015
# Jerome Cadet <jerome.cadet at pobox.com>, 2015
# PINSET Romaric <inactive+RomaricP at transifex.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: BOINC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-23 18:52-0500\n"
-"PO-Revision-Date: 2015-07-24 21:58+0000\n"
-"Last-Translator: Jerome Cadet <jerome.cadet at pobox.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/boinc/language/fr/)\n"
+"POT-Creation-Date: 2015-08-24 17:05-0500\n"
+"PO-Revision-Date: 2015-09-17 19:03+0000\n"
+"Last-Translator: Clément Jonglez <clement.jonglez at isae.fr>\n"
+"Language-Team: French (http://www.transifex.com/boinc/boinc/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -306,7 +307,7 @@ msgstr "Montrer l'utilisation du disque"
#: clientgui/AdvancedFrame.cpp:438
msgid "Simple &View...\tCtrl+Shift+V"
-msgstr "&Vue Simple...\t⇥Ctrl+Shift+V"
+msgstr "&Vue Simple...\tCtrl+Shift+V"
#: clientgui/AdvancedFrame.cpp:439
msgid "Switch to the Simple View"
@@ -742,12 +743,12 @@ msgstr "%s n'est actuellement pas connecté à un client %s.\nVeuillez utiliser
msgid "Project web pages"
msgstr "Pages Web du projet"
-#: clientgui/BOINCClientManager.cpp:573
+#: clientgui/BOINCClientManager.cpp:545
#, c-format
msgid "%s - Unexpected Exit"
msgstr "%s - Fermeture inattendue"
-#: clientgui/BOINCClientManager.cpp:583
+#: clientgui/BOINCClientManager.cpp:555
#, c-format
msgid ""
"The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -798,7 +799,7 @@ msgstr "%s a réussi à se déconnecter d'Internet."
msgid "%s failed to disconnected from the Internet."
msgstr "%s n'a pas réussi à se déconnecter d'Internet."
-#: clientgui/BOINCGUIApp.cpp:351
+#: clientgui/BOINCGUIApp.cpp:356
#, c-format
msgid ""
"You currently are not authorized to manage the client.\n"
@@ -811,90 +812,94 @@ msgid ""
" user group."
msgstr "Vous n'êtes pas autorisé actuellement à gérer le client.\n\nPour exécuter %s à l'aide de ce compte, merci de :\n- réinstaller %s en répondant \"Oui\" à la question sur\nles utilisateurs non-administrateurs\nou\n- contacter votre administrateur pour qu'il ajoute ce compte au\ngroupe utilisateur \"boinc_master\"."
-#: clientgui/BOINCGUIApp.cpp:357
+#: clientgui/BOINCGUIApp.cpp:362
#, c-format
msgid ""
"%s ownership or permissions are not set properly; please reinstall %s.\n"
"(Error code %d"
msgstr "Les autorisations des fichiers %s ne sont pas paramétrées correctement; veuillez réinstaller %s.\n(Code erreur %d"
-#: clientgui/BOINCGUIApp.cpp:363
+#: clientgui/BOINCGUIApp.cpp:368
msgid " at "
msgstr " chez "
-#: clientgui/BOINCGUIApp.cpp:366 clientgui/MainDocument.cpp:2494
-#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
+#: clientgui/BOINCGUIApp.cpp:371 clientgui/MainDocument.cpp:2495
+#: clientgui/MainDocument.cpp:2554 clientgui/ViewTransfers.cpp:887
msgid ")"
msgstr ")"
-#: clientgui/BOINCGUIApp.cpp:396
+#: clientgui/BOINCGUIApp.cpp:401
msgid ""
"A reboot is required in order for BOINC to run properly.\n"
"Please reboot your computer and try again."
msgstr "Un redémarrage est requis pour le bon fonctionnement de BOINC.\nVeuillez redémarrer votre ordinateur et réessayer."
-#: clientgui/BOINCGUIApp.cpp:397 clientgui/DlgAbout.cpp:153
+#: clientgui/BOINCGUIApp.cpp:402 clientgui/DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "Manager BOINC"
-#: clientgui/BOINCGUIApp.cpp:658
+#: clientgui/BOINCGUIApp.cpp:664
msgid "BOINC Manager was started by the operating system automatically"
msgstr "BOINC Manager a été démarré automatiquement par le système d'exploitation."
-#: clientgui/BOINCGUIApp.cpp:660
+#: clientgui/BOINCGUIApp.cpp:666
msgid "Startup BOINC so only the system tray icon is visible"
msgstr "Démarrer BOINC avec seulement l'icône de la barre des tâches visible"
-#: clientgui/BOINCGUIApp.cpp:662
+#: clientgui/BOINCGUIApp.cpp:668
msgid "Directory containing the BOINC Client executable"
msgstr "Répertoire contenant les fichiers exécutables de BOINC"
-#: clientgui/BOINCGUIApp.cpp:663
+#: clientgui/BOINCGUIApp.cpp:669
msgid "BOINC data directory"
msgstr "Répertoire des données BOINC"
-#: clientgui/BOINCGUIApp.cpp:665
+#: clientgui/BOINCGUIApp.cpp:671
msgid "Host name or IP address"
msgstr "Nom de l'hôte ou adresse IP"
-#: clientgui/BOINCGUIApp.cpp:666
+#: clientgui/BOINCGUIApp.cpp:672
msgid "GUI RPC port number"
msgstr "Numéro de port GUI RPC"
-#: clientgui/BOINCGUIApp.cpp:667
+#: clientgui/BOINCGUIApp.cpp:673
msgid "Password"
msgstr "Mot de passe"
-#: clientgui/BOINCGUIApp.cpp:668
+#: clientgui/BOINCGUIApp.cpp:674
msgid "Startup BOINC with these optional arguments"
msgstr "Démarrer BOINC avec ces arguments optionnels"
-#: clientgui/BOINCGUIApp.cpp:669
+#: clientgui/BOINCGUIApp.cpp:675
msgid "disable BOINC security users and permissions"
msgstr "désactiver les permissions et les sécurités utilisateur de BOINC"
-#: clientgui/BOINCGUIApp.cpp:670
+#: clientgui/BOINCGUIApp.cpp:676
msgid "set skin debugging mode to enable skin manager error messages"
msgstr "sélectionner le mode débogage d'apparence pour activer les messages d'erreur du gestionnaire d'apparence"
-#: clientgui/BOINCGUIApp.cpp:671
+#: clientgui/BOINCGUIApp.cpp:677
msgid "multiple instances of BOINC Manager allowed"
msgstr "instances multiples du gestionnaire BOINC autorisées"
-#: clientgui/BOINCGUIApp.cpp:673
+#: clientgui/BOINCGUIApp.cpp:679
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "Non utilisé: contournement du bogue dans XCode 4.2"
+#: clientgui/BOINCGUIApp.cpp:681
+msgid "Not run the daemon"
+msgstr "Ne pas lancer le démon"
+
#. These are just special tags so deal with them in a special way
-#: clientgui/BOINCGUIApp.cpp:920
+#: clientgui/BOINCGUIApp.cpp:931
msgid "(Automatic Detection)"
msgstr "(Détection automatique)"
-#: clientgui/BOINCGUIApp.cpp:921
+#: clientgui/BOINCGUIApp.cpp:932
msgid "(Unknown)"
msgstr "(Inconnu)"
-#: clientgui/BOINCGUIApp.cpp:922
+#: clientgui/BOINCGUIApp.cpp:933
msgid "(User Defined)"
msgstr "(Défini par l'utilisateur)"
@@ -922,7 +927,7 @@ msgstr "Mettre en veille le GPU"
msgid "E&xit"
msgstr "&Quitter"
-#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:806
+#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:808
#: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
#: clientgui/sg_ProjectCommandPopup.cpp:125
#: clientgui/sg_TaskCommandPopup.cpp:118
@@ -1080,7 +1085,7 @@ msgid "For more information, visit "
msgstr "Pour plus d'informations, visitez "
#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:410
#: clientgui/DlgSelectComputer.cpp:163
msgid "&OK"
msgstr "&OK"
@@ -1105,19 +1110,23 @@ msgstr "Le nombre doit être compris entre 0 et 10"
msgid "Number must be between 0 and 100"
msgstr "Le nombre doit être compris entre 0 et 100"
-#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:847
+#: clientgui/DlgAdvPreferences.cpp:689
+msgid "Number must be between 1 and 100"
+msgstr "Le nombre doit être compris entre 0 et 100"
+
+#: clientgui/DlgAdvPreferences.cpp:947 clientgui/sg_DlgPreferences.cpp:847
msgid "invalid input value detected"
msgstr "valeur invalide détectée"
-#: clientgui/DlgAdvPreferences.cpp:958 clientgui/sg_DlgPreferences.cpp:849
+#: clientgui/DlgAdvPreferences.cpp:959 clientgui/sg_DlgPreferences.cpp:849
msgid "Validation Error"
msgstr "Erreur de Validation"
-#: clientgui/DlgAdvPreferences.cpp:1170
+#: clientgui/DlgAdvPreferences.cpp:1171
msgid "Discard local preferences and use web-based preferences?"
msgstr "Remplacer les préférences locales par les préférences enregistrées sur le web ?"
-#: clientgui/DlgAdvPreferences.cpp:1171 clientgui/sg_DlgPreferences.cpp:1175
+#: clientgui/DlgAdvPreferences.cpp:1172 clientgui/sg_DlgPreferences.cpp:1175
msgid "Confirmation"
msgstr "Confirmation"
@@ -1619,7 +1628,7 @@ msgstr "%s - Journal des événements"
#. Create List Pane Items
#: clientgui/DlgEventLog.cpp:237 clientgui/ViewMessages.cpp:117
-#: clientgui/ViewProjects.cpp:253 clientgui/ViewStatistics.cpp:411
+#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:411
#: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
#: clientgui/ViewWork.cpp:260
msgid "Project"
@@ -1701,7 +1710,7 @@ msgid "Add an application to this list"
msgstr "Ajouter une application à cette liste"
#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
-#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:90
+#: clientgui/ViewProjects.cpp:234 clientgui/sg_ProjectCommandPopup.cpp:90
msgid "Remove"
msgstr "Retirer"
@@ -1801,7 +1810,7 @@ msgid "Remember this decision and do not show this dialog."
msgstr "Se rappeler de cette décision et ne plus afficher cette fenêtre."
#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/DlgOptions.cpp:415 clientgui/DlgSelectComputer.cpp:168
#: clientgui/wizardex.cpp:378
msgid "&Cancel"
msgstr "&Annuler"
@@ -1832,8 +1841,8 @@ msgstr "Confirmer les valeurs par défaut"
#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
-msgid "Don't fetch tasks for "
-msgstr "Ne pas charger de tâches pour "
+msgid "Don't request tasks for "
+msgstr "Ne pas demander de tâches pour"
#: clientgui/DlgItemProperties.cpp:194
msgid "Project preference"
@@ -1853,13 +1862,13 @@ msgstr "La configuration du client exclue "
#: clientgui/DlgItemProperties.cpp:209
#, c-format
-msgid "%s work fetch deferred for"
-msgstr "%s demande de travail différée de"
+msgid "%s task request deferred for"
+msgstr "%s demande de tâche différée de"
#: clientgui/DlgItemProperties.cpp:213
#, c-format
-msgid "%s work fetch deferral interval"
-msgstr "%s intervalle d'ajournement de demande de travail"
+msgid "%s task request deferral interval"
+msgstr "%s intervalle d'ajournement de demande de tâche"
#. set dialog title
#: clientgui/DlgItemProperties.cpp:247
@@ -1867,7 +1876,7 @@ msgid "Properties of project "
msgstr "Propriétés du projet "
#. layout controls
-#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:232
msgid "General"
msgstr "Général"
@@ -1883,7 +1892,7 @@ msgstr "Nom d'utilisateur"
msgid "Team name"
msgstr "Nom de l'équipe"
-#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:258
+#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:260
msgid "Resource share"
msgstr "Partage des ressources"
@@ -1927,8 +1936,8 @@ msgid "no"
msgstr "non"
#: clientgui/DlgItemProperties.cpp:271
-msgid "Don't request more work"
-msgstr "Ne pas demander de travail supplémentaire"
+msgid "Don't request tasks"
+msgstr "Ne pas demander de tâches"
#: clientgui/DlgItemProperties.cpp:273
msgid "Scheduler call in progress"
@@ -2088,149 +2097,161 @@ msgstr "par minute"
msgid "per second"
msgstr "par seconde"
-#: clientgui/DlgItemProperties.cpp:482 clientgui/ViewWork.cpp:1125
+#: clientgui/DlgItemProperties.cpp:419
+msgid "Executable"
+msgstr "Exécutable"
+
+#: clientgui/DlgItemProperties.cpp:485 clientgui/ViewWork.cpp:1125
#: clientgui/sg_TaskPanel.cpp:828
msgid "Local: "
msgstr "Local:"
-#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:130 clientgui/DlgOptions.cpp:136
msgid "Options"
msgstr "Options"
-#: clientgui/DlgOptions.cpp:178
+#: clientgui/DlgOptions.cpp:179
msgid "Language:"
msgstr "Langue :"
-#: clientgui/DlgOptions.cpp:185
+#: clientgui/DlgOptions.cpp:186
msgid "What language should BOINC use?"
msgstr "Quelle langue BOINC doit-il utiliser ?"
-#: clientgui/DlgOptions.cpp:189
+#: clientgui/DlgOptions.cpp:190
msgid "Notice reminder interval:"
msgstr "Intervalle de notifications"
-#: clientgui/DlgOptions.cpp:196
+#: clientgui/DlgOptions.cpp:197
msgid "How often should BOINC remind you of new notices?"
msgstr "A quelle fréquence BOINC doit-il vous rappeler la présence de nouvelles notifications?"
-#: clientgui/DlgOptions.cpp:201
+#: clientgui/DlgOptions.cpp:202
msgid "Run Manager at login?"
msgstr "Démarrer le Manager à l'ouverture de session?"
-#: clientgui/DlgOptions.cpp:207
+#: clientgui/DlgOptions.cpp:208
msgid "Run the BOINC Manager when you log on."
msgstr "Démarre le BOINC Manager lorsque vous ouvrez une session."
-#: clientgui/DlgOptions.cpp:212
+#: clientgui/DlgOptions.cpp:213
+msgid "Run daemon?"
+msgstr "Lancer le démon?"
+
+#: clientgui/DlgOptions.cpp:219
+msgid "Run daemon when launching the Manager."
+msgstr "Lancer le démon au démarrage du Manager."
+
+#: clientgui/DlgOptions.cpp:223
msgid "Enable Manager exit dialog?"
msgstr "Activer le dialogue de fermeture du Manager ?"
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgOptions.cpp:229
msgid "Display the exit dialog when shutting down the Manager."
msgstr "Affiche le dialogue de sortie lorsque vous fermez le Manager."
-#: clientgui/DlgOptions.cpp:229
+#: clientgui/DlgOptions.cpp:240
msgid "Dial-up and Virtual Private Network settings"
msgstr "Réglages de la connexion RTC et Réseau Privé Virtuel"
-#: clientgui/DlgOptions.cpp:243
+#: clientgui/DlgOptions.cpp:254
msgid "&Set Default"
msgstr "&Choisir par défaut"
-#: clientgui/DlgOptions.cpp:248
+#: clientgui/DlgOptions.cpp:259
msgid "&Clear Default"
msgstr "&Effacer le choix par défaut"
-#: clientgui/DlgOptions.cpp:255
+#: clientgui/DlgOptions.cpp:266
msgid "Default Connection:"
msgstr "Connexion par défaut:"
-#: clientgui/DlgOptions.cpp:262
+#: clientgui/DlgOptions.cpp:273
msgid "Connections"
msgstr "Connexions"
-#: clientgui/DlgOptions.cpp:271
+#: clientgui/DlgOptions.cpp:282
msgid "Connect via HTTP proxy server"
msgstr "Se connecter via un serveur proxy HTTP"
-#: clientgui/DlgOptions.cpp:275
+#: clientgui/DlgOptions.cpp:286
msgid "HTTP Proxy Server Configuration"
msgstr "Configuration d'un serveur proxy HTTP"
-#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:294 clientgui/DlgOptions.cpp:358
msgid "Address:"
msgstr "Adresse:"
-#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:302 clientgui/DlgOptions.cpp:366
#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
msgid "Port:"
msgstr "Port:"
-#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:310 clientgui/DlgOptions.cpp:374
msgid "Don't use proxy for:"
msgstr "Ne pas utiliser de proxy pour:"
-#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
msgid "Leave these blank if not needed"
msgstr "Laisser vide si non nécessaire"
-#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:323 clientgui/DlgOptions.cpp:387
#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
msgid "User Name:"
msgstr "Nom d'utilisateur:"
-#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:331 clientgui/DlgOptions.cpp:395
#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
#: clientgui/ProxyPage.cpp:366
msgid "Password:"
msgstr "Mot de passe:"
-#: clientgui/DlgOptions.cpp:327
+#: clientgui/DlgOptions.cpp:338
msgid "HTTP Proxy"
msgstr "Proxy HTTP"
-#: clientgui/DlgOptions.cpp:335
+#: clientgui/DlgOptions.cpp:346
msgid "Connect via SOCKS proxy server"
msgstr "Se connecter via un serveur proxy SOCKS"
-#: clientgui/DlgOptions.cpp:339
+#: clientgui/DlgOptions.cpp:350
msgid "SOCKS Proxy Server Configuration"
msgstr "Configuration d'un serveur proxy SOCKS"
-#: clientgui/DlgOptions.cpp:391
+#: clientgui/DlgOptions.cpp:402
msgid "SOCKS Proxy"
msgstr "Proxy SOCKS"
-#: clientgui/DlgOptions.cpp:589
+#: clientgui/DlgOptions.cpp:600
msgid "always"
msgstr "toujours"
-#: clientgui/DlgOptions.cpp:590
+#: clientgui/DlgOptions.cpp:601
msgid "1 hour"
msgstr "1 heure"
-#: clientgui/DlgOptions.cpp:591
+#: clientgui/DlgOptions.cpp:602
msgid "6 hours"
msgstr "6 heures"
-#: clientgui/DlgOptions.cpp:592
+#: clientgui/DlgOptions.cpp:603
msgid "1 day"
msgstr "1 jour"
-#: clientgui/DlgOptions.cpp:593
+#: clientgui/DlgOptions.cpp:604
msgid "1 week"
msgstr "1 semaine"
-#: clientgui/DlgOptions.cpp:594
+#: clientgui/DlgOptions.cpp:605
msgid "never"
msgstr "jamais"
-#: clientgui/DlgOptions.cpp:691
+#: clientgui/DlgOptions.cpp:703
#, c-format
msgid "%s - Language Selection"
msgstr "%s - Choix de la Langue"
-#: clientgui/DlgOptions.cpp:698
+#: clientgui/DlgOptions.cpp:710
#, c-format
msgid ""
"The %s's language has been changed. In order for this change to take "
@@ -2376,7 +2397,7 @@ msgid "The home page of the GEO-600 project"
msgstr "La page d'accueil du projet GEO-600"
#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
-#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:441
+#: clientgui/ViewProjects.cpp:257 clientgui/ViewStatistics.cpp:441
msgid "Team"
msgstr "Equipe"
@@ -2440,203 +2461,203 @@ msgstr "Recherche"
msgid "Learn about the projects hosted at World Community Grid"
msgstr "S'informer sur les projets hébergés par World Community Grid"
-#: clientgui/MainDocument.cpp:583
+#: clientgui/MainDocument.cpp:584
msgid "Starting client"
msgstr "Client en court de démarrage"
-#: clientgui/MainDocument.cpp:591
+#: clientgui/MainDocument.cpp:592
msgid "Connecting to client"
msgstr "Connexion au client en cours"
-#: clientgui/MainDocument.cpp:1205
+#: clientgui/MainDocument.cpp:1206
msgid "Retrieving system state; please wait..."
msgstr "Recherche de l'état du système; veuillez patienter..."
-#: clientgui/MainDocument.cpp:1826
+#: clientgui/MainDocument.cpp:1827
msgid "Missing application"
msgstr "Application manquante"
-#: clientgui/MainDocument.cpp:1827
+#: clientgui/MainDocument.cpp:1828
msgid ""
"Please download and install the CoRD application from "
"http://cord.sourceforge.net"
msgstr "Merci d'installer l'application CorD à partir de http://cord.sourceforge.net"
-#: clientgui/MainDocument.cpp:2442
+#: clientgui/MainDocument.cpp:2443
msgid "on batteries"
msgstr " - sur batteries"
-#: clientgui/MainDocument.cpp:2443
+#: clientgui/MainDocument.cpp:2444
msgid "computer is in use"
msgstr "l'ordinateur est utilisé"
-#: clientgui/MainDocument.cpp:2444
+#: clientgui/MainDocument.cpp:2445
msgid "user request"
msgstr "requête utilisateur"
-#: clientgui/MainDocument.cpp:2445
+#: clientgui/MainDocument.cpp:2446
msgid "time of day"
msgstr "moment de la journée"
-#: clientgui/MainDocument.cpp:2446
+#: clientgui/MainDocument.cpp:2447
msgid "CPU benchmarks in progress"
msgstr "Tests de puissance de l'ordinateur en cours"
-#: clientgui/MainDocument.cpp:2447
+#: clientgui/MainDocument.cpp:2448
msgid "need disk space - check preferences"
msgstr "a besoin d'espace disque - vérifiez les préférences"
-#: clientgui/MainDocument.cpp:2448
+#: clientgui/MainDocument.cpp:2449
msgid "computer is not in use"
msgstr "l'ordinateur n'est pas utilisé"
-#: clientgui/MainDocument.cpp:2449
+#: clientgui/MainDocument.cpp:2450
msgid "starting up"
msgstr "en cours de démarrage"
-#: clientgui/MainDocument.cpp:2450
+#: clientgui/MainDocument.cpp:2451
msgid "an exclusive app is running"
msgstr " une application exclusive est en cours d'exécution"
-#: clientgui/MainDocument.cpp:2451
+#: clientgui/MainDocument.cpp:2452
msgid "CPU is busy"
msgstr "Le CPU est occupé"
-#: clientgui/MainDocument.cpp:2452
+#: clientgui/MainDocument.cpp:2453
msgid "network bandwidth limit exceeded"
msgstr "dépassement de limite du débit réseau"
-#: clientgui/MainDocument.cpp:2453
+#: clientgui/MainDocument.cpp:2454
msgid "requested by operating system"
msgstr "demandé par le système d'exploitation"
-#: clientgui/MainDocument.cpp:2455
+#: clientgui/MainDocument.cpp:2456
msgid "unknown reason"
msgstr "raison inconnue"
-#: clientgui/MainDocument.cpp:2477
+#: clientgui/MainDocument.cpp:2478
msgid "GPU missing, "
msgstr "GPU absent, "
-#: clientgui/MainDocument.cpp:2484
+#: clientgui/MainDocument.cpp:2485
msgid "New"
msgstr "Nouveau"
-#: clientgui/MainDocument.cpp:2488
+#: clientgui/MainDocument.cpp:2489
msgid "Download failed"
msgstr "Echec du téléchargement"
-#: clientgui/MainDocument.cpp:2490
+#: clientgui/MainDocument.cpp:2491
msgid "Downloading"
msgstr "Téléchargement en cours"
-#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
+#: clientgui/MainDocument.cpp:2493 clientgui/MainDocument.cpp:2552
msgid " (suspended - "
msgstr " (suspendu - "
-#: clientgui/MainDocument.cpp:2500
+#: clientgui/MainDocument.cpp:2501
msgid "Project suspended by user"
msgstr "Projet suspendu par l'utilisateur"
-#: clientgui/MainDocument.cpp:2502
+#: clientgui/MainDocument.cpp:2503
msgid "Task suspended by user"
msgstr "Tâche suspendue par l'utilisateur"
#. an NCI process can be running even though computation is suspended
#. (because of <dont_suspend_nci>
-#: clientgui/MainDocument.cpp:2507
+#: clientgui/MainDocument.cpp:2508
msgid "Suspended - "
msgstr "Suspendu - "
-#: clientgui/MainDocument.cpp:2510
+#: clientgui/MainDocument.cpp:2511
msgid "GPU suspended - "
msgstr "Activité du GPU suspendue"
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2515
msgid "Waiting for memory"
msgstr "En attente de mémoire"
-#: clientgui/MainDocument.cpp:2516
+#: clientgui/MainDocument.cpp:2517
msgid "Waiting for shared memory"
msgstr "En attente de mémoire partagée"
-#: clientgui/MainDocument.cpp:2518
+#: clientgui/MainDocument.cpp:2519
msgid "Running"
msgstr "Calculs en cours"
-#: clientgui/MainDocument.cpp:2520
+#: clientgui/MainDocument.cpp:2521
msgid " (non-CPU-intensive)"
msgstr " (CPU-non-intensif)"
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2524
msgid "Waiting to run"
msgstr "Calculs en attente"
-#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
+#: clientgui/MainDocument.cpp:2526 clientgui/MainDocument.cpp:2529
msgid "Ready to start"
msgstr "Prêt à démarrer"
-#: clientgui/MainDocument.cpp:2532
+#: clientgui/MainDocument.cpp:2533
msgid "Postponed: "
msgstr "Reporté : "
-#: clientgui/MainDocument.cpp:2535
+#: clientgui/MainDocument.cpp:2536
msgid "Postponed"
msgstr "Reporté"
-#: clientgui/MainDocument.cpp:2539
+#: clientgui/MainDocument.cpp:2540
msgid "Waiting for network access"
msgstr " En attente d’accès réseau"
-#: clientgui/MainDocument.cpp:2543
+#: clientgui/MainDocument.cpp:2544
msgid "Computation error"
msgstr "Erreur de calcul"
-#: clientgui/MainDocument.cpp:2547
+#: clientgui/MainDocument.cpp:2548
msgid "Upload failed"
msgstr "Echec de l'envoi"
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2550
msgid "Uploading"
msgstr "Envoi en cours"
-#: clientgui/MainDocument.cpp:2560
+#: clientgui/MainDocument.cpp:2561
msgid "Aborted by user"
msgstr "Abandonné par l'utilisateur"
-#: clientgui/MainDocument.cpp:2563
+#: clientgui/MainDocument.cpp:2564
msgid "Aborted by project"
msgstr "Annulé par le projet"
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2567
msgid "Aborted: not started by deadline"
msgstr "Avorté : non démarré dans le délai imparti"
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2570
msgid "Aborted: task disk limit exceeded"
msgstr "Abandon: limite du disque excédée"
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2573
msgid "Aborted: run time limit exceeded"
msgstr "Abandon: limite du temps d'exécution excédée"
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2576
msgid "Aborted: memory limit exceeded"
msgstr "Abandon: limite de la mémoire excédée"
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2579
msgid "Aborted"
msgstr "Annulé"
-#: clientgui/MainDocument.cpp:2583
+#: clientgui/MainDocument.cpp:2584
msgid "Acknowledged"
msgstr "Confirmé"
-#: clientgui/MainDocument.cpp:2585
+#: clientgui/MainDocument.cpp:2586
msgid "Ready to report"
msgstr "Prêt à valider"
-#: clientgui/MainDocument.cpp:2587
+#: clientgui/MainDocument.cpp:2588
#, c-format
msgid "Error: invalid state '%d'"
msgstr "Erreur: état invalide '%d'"
@@ -2953,7 +2974,7 @@ msgid "'%s' does not contain a valid path."
msgstr "'%s' ne contient pas de chemin valide."
#. Setup View
-#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:200
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:202
#: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
#: clientgui/ViewWork.cpp:207
msgid "Commands"
@@ -3011,17 +3032,17 @@ msgstr "Il n'y a pas de nouveaux messages."
msgid "Notices"
msgstr "Remarques"
-#: clientgui/ViewProjects.cpp:204 clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewProjects.cpp:206 clientgui/sg_ProjectCommandPopup.cpp:66
msgid "Update"
msgstr "Mettre à jour"
-#: clientgui/ViewProjects.cpp:205 clientgui/sg_ProjectCommandPopup.cpp:67
+#: clientgui/ViewProjects.cpp:207 clientgui/sg_ProjectCommandPopup.cpp:67
msgid ""
"Report all completed tasks, get latest credit, get latest preferences, and "
"possibly get more tasks."
msgstr "Envoie le travail terminé, obtient les crédits les plus récents, met à jour les préférences, et si possible télécharge du travail."
-#: clientgui/ViewProjects.cpp:211 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:213 clientgui/ViewProjects.cpp:812
#: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
#: clientgui/sg_BoincSimpleFrame.cpp:893
#: clientgui/sg_ProjectCommandPopup.cpp:72
@@ -3030,196 +3051,196 @@ msgstr "Envoie le travail terminé, obtient les crédits les plus récents, met
msgid "Suspend"
msgstr "Suspendre"
-#: clientgui/ViewProjects.cpp:212 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:214 clientgui/ViewProjects.cpp:812
#: clientgui/sg_ProjectCommandPopup.cpp:73
#: clientgui/sg_ProjectCommandPopup.cpp:129
msgid "Suspend tasks for this project."
msgstr "Suspend le travail de ce projet."
-#: clientgui/ViewProjects.cpp:218 clientgui/ViewProjects.cpp:829
+#: clientgui/ViewProjects.cpp:220 clientgui/ViewProjects.cpp:831
#: clientgui/sg_ProjectCommandPopup.cpp:78
#: clientgui/sg_ProjectCommandPopup.cpp:136
msgid "No new tasks"
msgstr "Pas de nouveau travail"
-#: clientgui/ViewProjects.cpp:219 clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:221 clientgui/sg_ProjectCommandPopup.cpp:79
msgid "Don't get new tasks for this project."
msgstr "Ne récupère pas de nouveau travail pour ce projet."
-#: clientgui/ViewProjects.cpp:225 clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:227 clientgui/sg_ProjectCommandPopup.cpp:84
msgid "Reset project"
msgstr "Recommencer le projet"
-#: clientgui/ViewProjects.cpp:226 clientgui/sg_ProjectCommandPopup.cpp:85
+#: clientgui/ViewProjects.cpp:228 clientgui/sg_ProjectCommandPopup.cpp:85
msgid ""
"Delete all files and tasks associated with this project, and get new tasks."
" You can update the project first to report any completed tasks."
msgstr "Supprime tous les fichiers et tout le travail associé à ce projet et charge à nouveau les fichiers nécessaires. Vous pouvez d'abord mettre à jour le projet pour transmettre tout le travail effectué."
-#: clientgui/ViewProjects.cpp:233 clientgui/sg_ProjectCommandPopup.cpp:91
+#: clientgui/ViewProjects.cpp:235 clientgui/sg_ProjectCommandPopup.cpp:91
msgid ""
"Remove this project. Tasks in progress will be lost (use 'Update' first to "
"report any completed tasks)."
msgstr "Retirer ce projet. Le travail en cours sera perdu. (Cliquez d'abord sur 'Mettre à jour' pour envoyer le travail terminé)."
-#: clientgui/ViewProjects.cpp:239 clientgui/ViewWork.cpp:246
+#: clientgui/ViewProjects.cpp:241 clientgui/ViewWork.cpp:246
#: clientgui/sg_ProjectCommandPopup.cpp:96
#: clientgui/sg_TaskCommandPopup.cpp:84
msgid "Properties"
msgstr "Propriétés"
-#: clientgui/ViewProjects.cpp:240 clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:242 clientgui/sg_ProjectCommandPopup.cpp:97
msgid "Show project details."
msgstr "Afficher les détails du projet."
-#: clientgui/ViewProjects.cpp:254 clientgui/ViewStatistics.cpp:426
+#: clientgui/ViewProjects.cpp:256 clientgui/ViewStatistics.cpp:426
msgid "Account"
msgstr "Compte"
-#: clientgui/ViewProjects.cpp:256
+#: clientgui/ViewProjects.cpp:258
msgid "Work done"
msgstr "Travail effectué"
-#: clientgui/ViewProjects.cpp:257
+#: clientgui/ViewProjects.cpp:259
msgid "Avg. work done"
msgstr "Travail moyen"
-#: clientgui/ViewProjects.cpp:259 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewProjects.cpp:261 clientgui/ViewTransfers.cpp:215
#: clientgui/ViewWork.cpp:262
msgid "Status"
msgstr "Etat"
-#: clientgui/ViewProjects.cpp:338
+#: clientgui/ViewProjects.cpp:340
msgid "Projects"
msgstr "Projets"
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:392
msgid "Updating project..."
msgstr "Mise à jour du projet en cours..."
-#: clientgui/ViewProjects.cpp:432
+#: clientgui/ViewProjects.cpp:434
msgid "Resuming project..."
msgstr "Reprise du projet en cours..."
-#: clientgui/ViewProjects.cpp:436
+#: clientgui/ViewProjects.cpp:438
msgid "Suspending project..."
msgstr "Suspension du projet en cours..."
-#: clientgui/ViewProjects.cpp:473
+#: clientgui/ViewProjects.cpp:475
msgid "Telling project to allow additional task downloads..."
msgstr "Informe le projet qu'il peut télécharger du travail supplémentaire..."
-#: clientgui/ViewProjects.cpp:477
+#: clientgui/ViewProjects.cpp:479
msgid "Telling project to not fetch any additional tasks..."
msgstr "Informe le projet de ne pas télécharger de travail supplémentaire..."
-#: clientgui/ViewProjects.cpp:513
+#: clientgui/ViewProjects.cpp:515
msgid "Resetting project..."
msgstr "Réinitialisation du projet en cours..."
-#: clientgui/ViewProjects.cpp:526 clientgui/sg_ProjectCommandPopup.cpp:229
+#: clientgui/ViewProjects.cpp:528 clientgui/sg_ProjectCommandPopup.cpp:229
#, c-format
msgid "Are you sure you want to reset project '%s'?"
msgstr "Êtes-vous sûr de vouloir recommencer le projet '%s'?"
-#: clientgui/ViewProjects.cpp:532 clientgui/sg_ProjectCommandPopup.cpp:235
+#: clientgui/ViewProjects.cpp:534 clientgui/sg_ProjectCommandPopup.cpp:235
msgid "Reset Project"
msgstr "Recommencer le projet"
-#: clientgui/ViewProjects.cpp:571
+#: clientgui/ViewProjects.cpp:573
msgid "Removing project..."
msgstr "En train de retirer le projet..."
-#: clientgui/ViewProjects.cpp:584 clientgui/sg_ProjectCommandPopup.cpp:266
+#: clientgui/ViewProjects.cpp:586 clientgui/sg_ProjectCommandPopup.cpp:266
#, c-format
msgid "Are you sure you want to remove project '%s'?"
msgstr "Êtes-vous sûr de vouloir supprimer le projet '%s'?"
-#: clientgui/ViewProjects.cpp:590 clientgui/sg_ProjectCommandPopup.cpp:272
+#: clientgui/ViewProjects.cpp:592 clientgui/sg_ProjectCommandPopup.cpp:272
msgid "Remove Project"
msgstr "Supprimer le projet"
-#: clientgui/ViewProjects.cpp:631 clientgui/ViewWork.cpp:686
+#: clientgui/ViewProjects.cpp:633 clientgui/ViewWork.cpp:686
msgid "Launching browser..."
msgstr "Lancement du navigateur en cours..."
-#: clientgui/ViewProjects.cpp:806 clientgui/sg_ProjectCommandPopup.cpp:126
+#: clientgui/ViewProjects.cpp:808 clientgui/sg_ProjectCommandPopup.cpp:126
msgid "Resume tasks for this project."
msgstr "Reprend le travail pour ce projet."
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:133
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:133
msgid "Allow new tasks"
msgstr "Autoriser du nouveau travail"
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:134
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:134
msgid "Allow fetching new tasks for this project."
msgstr "Autorise le téléchargement de nouveau travail pour ce projet."
-#: clientgui/ViewProjects.cpp:829 clientgui/sg_ProjectCommandPopup.cpp:137
+#: clientgui/ViewProjects.cpp:831 clientgui/sg_ProjectCommandPopup.cpp:137
msgid "Don't fetch new tasks for this project."
msgstr "Ne récupère pas de nouveau travail pour ce projet."
-#: clientgui/ViewProjects.cpp:1133
+#: clientgui/ViewProjects.cpp:1135
msgid "Requested by user"
msgstr "Demandé par l'utilisateur"
-#: clientgui/ViewProjects.cpp:1134
+#: clientgui/ViewProjects.cpp:1136
msgid "To fetch work"
msgstr "Pour demander du travail"
-#: clientgui/ViewProjects.cpp:1135
+#: clientgui/ViewProjects.cpp:1137
msgid "To report completed tasks"
msgstr "Pour rapporter une tâche terminée"
-#: clientgui/ViewProjects.cpp:1136
+#: clientgui/ViewProjects.cpp:1138
msgid "To send trickle-up message"
msgstr "Pour envoyer les messages de progression de tâche"
-#: clientgui/ViewProjects.cpp:1137
+#: clientgui/ViewProjects.cpp:1139
msgid "Requested by account manager"
msgstr "Demandé par le gestionnaire de compte"
-#: clientgui/ViewProjects.cpp:1138
+#: clientgui/ViewProjects.cpp:1140
msgid "Project initialization"
msgstr "Initialisation du projet"
-#: clientgui/ViewProjects.cpp:1139
+#: clientgui/ViewProjects.cpp:1141
msgid "Requested by project"
msgstr "Demandé par le projet"
-#: clientgui/ViewProjects.cpp:1140
+#: clientgui/ViewProjects.cpp:1142
msgid "Unknown reason"
msgstr "Raison inconnue"
-#: clientgui/ViewProjects.cpp:1154
+#: clientgui/ViewProjects.cpp:1156
msgid "Suspended by user"
msgstr "Suspendu par l'utilisateur"
-#: clientgui/ViewProjects.cpp:1157
+#: clientgui/ViewProjects.cpp:1159
msgid "Won't get new tasks"
msgstr "Pas de nouveau travail"
-#: clientgui/ViewProjects.cpp:1160
+#: clientgui/ViewProjects.cpp:1162
msgid "Project ended - OK to remove"
msgstr "Projet terminé - OK pour le retirer."
-#: clientgui/ViewProjects.cpp:1163
+#: clientgui/ViewProjects.cpp:1165
msgid "Will remove when tasks done"
msgstr "Le projet sera retiré lorsque les tâches seront terminées"
-#: clientgui/ViewProjects.cpp:1166
+#: clientgui/ViewProjects.cpp:1168
msgid "Scheduler request pending"
msgstr "Requête au planificateur en attente"
-#: clientgui/ViewProjects.cpp:1172
+#: clientgui/ViewProjects.cpp:1174
msgid "Scheduler request in progress"
msgstr "Requête au planificateur en cours"
-#: clientgui/ViewProjects.cpp:1175
+#: clientgui/ViewProjects.cpp:1177
msgid "Trickle up message pending"
msgstr "Message de progression de tâche en cours"
-#: clientgui/ViewProjects.cpp:1181
+#: clientgui/ViewProjects.cpp:1183
msgid "Communication deferred"
msgstr "Communication différée "
diff --git a/locale/ja/BOINC-Manager.mo b/locale/ja/BOINC-Manager.mo
index 1d4a5bd..9e4332c 100644
Binary files a/locale/ja/BOINC-Manager.mo and b/locale/ja/BOINC-Manager.mo differ
diff --git a/locale/ja/BOINC-Manager.po b/locale/ja/BOINC-Manager.po
index 513f7df..45dc6e4 100644
--- a/locale/ja/BOINC-Manager.po
+++ b/locale/ja/BOINC-Manager.po
@@ -3,16 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# boinc at tokyo <boinc.tokyo at gmail.com>, 2015
# crazymaster <ken.i54k at gmail.com>, 2015
# Masahiro Tagashira, 2015
msgid ""
msgstr ""
"Project-Id-Version: BOINC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 16:15-0500\n"
-"PO-Revision-Date: 2015-07-16 03:31+0000\n"
-"Last-Translator: Masahiro Tagashira\n"
-"Language-Team: Japanese (http://www.transifex.com/p/boinc/language/ja/)\n"
+"POT-Creation-Date: 2015-08-24 17:05-0500\n"
+"PO-Revision-Date: 2015-09-13 03:02+0000\n"
+"Last-Translator: boinc at tokyo <boinc.tokyo at gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/boinc/boinc/language/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -206,369 +207,369 @@ msgstr "接続しました"
msgid "Disconnected"
msgstr "接続を切りました"
-#: clientgui/AdvancedFrame.cpp:327
+#: clientgui/AdvancedFrame.cpp:329
#, c-format
msgid "New %s window..."
msgstr "新しい %s ウィンドウ…"
-#: clientgui/AdvancedFrame.cpp:331
+#: clientgui/AdvancedFrame.cpp:333
#, c-format
msgid "Open another %s window"
msgstr "もう一つ別の %s のウィンドウを開きます"
-#: clientgui/AdvancedFrame.cpp:342
+#: clientgui/AdvancedFrame.cpp:344
msgid "Select computer..."
msgstr "コンピュータの選択..."
-#: clientgui/AdvancedFrame.cpp:343
+#: clientgui/AdvancedFrame.cpp:345
msgid "Connect to a BOINC client on another computer"
msgstr "別のコンピュータの BOINC クライアントに接続"
-#: clientgui/AdvancedFrame.cpp:347
+#: clientgui/AdvancedFrame.cpp:349
msgid "Shut down connected client..."
msgstr "接続しているクライアントをシャットダウン..."
-#: clientgui/AdvancedFrame.cpp:348
+#: clientgui/AdvancedFrame.cpp:350
msgid "Shut down the currently connected BOINC client"
msgstr "現在接続している BOINC クライアントをシャットダウンさせます"
-#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
+#: clientgui/AdvancedFrame.cpp:355 clientgui/sg_BoincSimpleFrame.cpp:120
#, c-format
msgid "Close the %s window"
msgstr "この %s ウィンドウを閉じます"
-#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
+#: clientgui/AdvancedFrame.cpp:358 clientgui/sg_BoincSimpleFrame.cpp:123
msgid "&Close window"
msgstr "ウィンドウを閉じる(&C)"
-#: clientgui/AdvancedFrame.cpp:365 clientgui/AdvancedFrame.cpp:370
-#: clientgui/AdvancedFrame.cpp:375 clientgui/sg_BoincSimpleFrame.cpp:132
+#: clientgui/AdvancedFrame.cpp:367 clientgui/AdvancedFrame.cpp:372
+#: clientgui/AdvancedFrame.cpp:377 clientgui/sg_BoincSimpleFrame.cpp:132
#: clientgui/sg_BoincSimpleFrame.cpp:137
#, c-format
msgid "Exit %s"
msgstr "%s を終了"
-#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+#: clientgui/AdvancedFrame.cpp:391 clientgui/sg_BoincSimpleFrame.cpp:151
msgid "Preferences..."
msgstr "設定..."
-#: clientgui/AdvancedFrame.cpp:398
+#: clientgui/AdvancedFrame.cpp:400
msgid "&Notices\tCtrl+Shift+N"
msgstr "お知らせ(&N)\tCtrl+Shift+N"
-#: clientgui/AdvancedFrame.cpp:399
+#: clientgui/AdvancedFrame.cpp:401
msgid "Show notices"
msgstr "お知らせを表示します"
-#: clientgui/AdvancedFrame.cpp:404
+#: clientgui/AdvancedFrame.cpp:406
msgid "&Projects\tCtrl+Shift+P"
msgstr "プロジェクト(&P)\tCtrl+Shift+P"
-#: clientgui/AdvancedFrame.cpp:405
+#: clientgui/AdvancedFrame.cpp:407
msgid "Show projects"
msgstr "プロジェクトを表示します"
-#: clientgui/AdvancedFrame.cpp:410
+#: clientgui/AdvancedFrame.cpp:412
msgid "&Tasks\tCtrl+Shift+T"
msgstr "タスク(&T)\tCtrl+Shift+T"
-#: clientgui/AdvancedFrame.cpp:411
+#: clientgui/AdvancedFrame.cpp:413
msgid "Show tasks"
msgstr "タスクを表示します"
-#: clientgui/AdvancedFrame.cpp:416
+#: clientgui/AdvancedFrame.cpp:418
msgid "Trans&fers\tCtrl+Shift+X"
msgstr "転送(&F)\tCtrl+Shift+X"
-#: clientgui/AdvancedFrame.cpp:417
+#: clientgui/AdvancedFrame.cpp:419
msgid "Show file transfers"
msgstr "ファイル転送を表示します"
-#: clientgui/AdvancedFrame.cpp:422
+#: clientgui/AdvancedFrame.cpp:424
msgid "&Statistics\tCtrl+Shift+S"
msgstr "統計(&S)\tCtrl+Shift+S"
-#: clientgui/AdvancedFrame.cpp:423
+#: clientgui/AdvancedFrame.cpp:425
msgid "Show statistics"
msgstr "統計を表示します"
-#: clientgui/AdvancedFrame.cpp:428
+#: clientgui/AdvancedFrame.cpp:430
msgid "&Disk\tCtrl+Shift+D"
msgstr "ディスク(&D)\tCtrl+Shift+D"
-#: clientgui/AdvancedFrame.cpp:429
+#: clientgui/AdvancedFrame.cpp:431
msgid "Show disk usage"
msgstr "ディスク使用量を表示します"
-#: clientgui/AdvancedFrame.cpp:436
+#: clientgui/AdvancedFrame.cpp:438
msgid "Simple &View...\tCtrl+Shift+V"
msgstr "簡易表示(&V)...\tCtrl+Shift+V"
-#: clientgui/AdvancedFrame.cpp:437
+#: clientgui/AdvancedFrame.cpp:439
msgid "Switch to the Simple View"
msgstr "簡易表示に切り替えます"
-#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:453 clientgui/AdvancedFrame.cpp:477
#: clientgui/sg_BoincSimpleFrame.cpp:205
msgid "&Add project..."
msgstr "プロジェクトを追加(&A)..."
-#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/AdvancedFrame.cpp:454 clientgui/AdvancedFrame.cpp:478
#: clientgui/sg_BoincSimpleFrame.cpp:206
msgid "Add a project"
msgstr "プロジェクトを追加します"
-#: clientgui/AdvancedFrame.cpp:456
+#: clientgui/AdvancedFrame.cpp:458
msgid "&Use account manager..."
msgstr "アカウント・マネージャを使用(&U)…"
-#: clientgui/AdvancedFrame.cpp:457
+#: clientgui/AdvancedFrame.cpp:459
msgid "Use an account manager to control this computer."
msgstr "このコンピュータの管理にアカウント・マネージャを使用します。"
-#: clientgui/AdvancedFrame.cpp:461
+#: clientgui/AdvancedFrame.cpp:463
#, c-format
msgid "&Synchronize with %s"
msgstr "%s に同期(&S)"
-#: clientgui/AdvancedFrame.cpp:465
+#: clientgui/AdvancedFrame.cpp:467
#, c-format
msgid "Get current settings from %s"
msgstr "%s から現在の設定を取得します"
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:481
#, c-format
msgid "S&top using %s..."
msgstr "%s を使うのを止める(&T)..."
-#: clientgui/AdvancedFrame.cpp:485
+#: clientgui/AdvancedFrame.cpp:487
msgid "Remove this computer from account manager control."
msgstr "このコンピュータをアカウント・マネージャの管理からはずします"
-#: clientgui/AdvancedFrame.cpp:491
+#: clientgui/AdvancedFrame.cpp:493
msgid "Run CPU &benchmarks"
msgstr "CPU ベンチマークを実行(&B)"
-#: clientgui/AdvancedFrame.cpp:492
+#: clientgui/AdvancedFrame.cpp:494
msgid "Run tests that measure CPU speed"
msgstr "CPU 速度を測定するテストを実行"
-#: clientgui/AdvancedFrame.cpp:496
+#: clientgui/AdvancedFrame.cpp:498
msgid "Retry pending transfers"
msgstr "保留中の転送を再試行"
-#: clientgui/AdvancedFrame.cpp:497
+#: clientgui/AdvancedFrame.cpp:499
msgid "Retry deferred file transfers and task requests"
msgstr "延期されたファイル転送とタスク要求を再試行します"
-#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+#: clientgui/AdvancedFrame.cpp:504 clientgui/sg_BoincSimpleFrame.cpp:211
msgid "Event Log...\tCtrl+Shift+E"
msgstr "イベント・ログ...\tCtrl+Shift+E"
-#: clientgui/AdvancedFrame.cpp:503
+#: clientgui/AdvancedFrame.cpp:505
msgid "Show diagnostic messages"
msgstr "診断メッセージを表示します"
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:513
msgid "&Run always"
msgstr "常時稼働(&R)"
-#: clientgui/AdvancedFrame.cpp:512
+#: clientgui/AdvancedFrame.cpp:514
msgid "Allow work regardless of preferences"
msgstr "プレファレンス(好みの設定)に関わらず仕事の実行を許可します"
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:518
msgid "Run based on &preferences"
msgstr "プレファレンスに従って稼働(&P)"
-#: clientgui/AdvancedFrame.cpp:517
+#: clientgui/AdvancedFrame.cpp:519
msgid "Allow work according to preferences"
msgstr "プレファレンス(好みの設定)に従って仕事の実行を許可します。"
-#: clientgui/AdvancedFrame.cpp:521
+#: clientgui/AdvancedFrame.cpp:523
msgid "&Suspend"
msgstr "一時停止(&S)"
-#: clientgui/AdvancedFrame.cpp:522
+#: clientgui/AdvancedFrame.cpp:524
msgid "Stop work regardless of preferences"
msgstr "プレファレンス(好みの設定)に関わらず仕事の実行を停止します"
-#: clientgui/AdvancedFrame.cpp:547
+#: clientgui/AdvancedFrame.cpp:549
msgid "Use GPU always"
msgstr "常時 GPU を使う"
-#: clientgui/AdvancedFrame.cpp:548
+#: clientgui/AdvancedFrame.cpp:550
msgid "Allow GPU work regardless of preferences"
msgstr "プレファレンス(好みの設定)に関わらず GPU による仕事の実行を許可します"
-#: clientgui/AdvancedFrame.cpp:552
+#: clientgui/AdvancedFrame.cpp:554
msgid "Use GPU based on preferences"
msgstr "プレファレンスに従って GPUを使用"
-#: clientgui/AdvancedFrame.cpp:553
+#: clientgui/AdvancedFrame.cpp:555
msgid "Allow GPU work according to preferences"
msgstr "プレファレンス(好みの設定)に従って GPU による仕事の実行を許可します"
-#: clientgui/AdvancedFrame.cpp:557
+#: clientgui/AdvancedFrame.cpp:559
msgid "Suspend GPU"
msgstr "GPU の使用を一時停止"
-#: clientgui/AdvancedFrame.cpp:558
+#: clientgui/AdvancedFrame.cpp:560
msgid "Stop GPU work regardless of preferences"
msgstr "プレファレンス(好みの設定)に関わらず GPU による仕事の実行を停止します"
-#: clientgui/AdvancedFrame.cpp:582
+#: clientgui/AdvancedFrame.cpp:584
msgid "Network activity always"
msgstr "ネットワーク活動を常に許可"
-#: clientgui/AdvancedFrame.cpp:583
+#: clientgui/AdvancedFrame.cpp:585
msgid "Allow network activity regardless of preferences"
msgstr "プレファレンス(好みの設定)に関わらずネットワークアクセスを許可します"
-#: clientgui/AdvancedFrame.cpp:587
+#: clientgui/AdvancedFrame.cpp:589
msgid "Network activity based on preferences"
msgstr "プレファレンスに従ってネットワークを使用"
-#: clientgui/AdvancedFrame.cpp:588
+#: clientgui/AdvancedFrame.cpp:590
msgid "Allow network activity according to preferences"
msgstr "プレファレンス(好みの設定)に従ってネットワークアクセスを許可します"
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:594
msgid "Suspend network activity"
msgstr "ネットワーク活動を一時停止"
-#: clientgui/AdvancedFrame.cpp:593
+#: clientgui/AdvancedFrame.cpp:595
msgid "Stop network activity"
msgstr "ネットワーク活動を停止"
-#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
+#: clientgui/AdvancedFrame.cpp:604 clientgui/sg_BoincSimpleFrame.cpp:191
msgid "Computing &preferences..."
msgstr "計算に関するプレファレンス(&P)..."
-#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
+#: clientgui/AdvancedFrame.cpp:605 clientgui/sg_BoincSimpleFrame.cpp:192
msgid "Configure computing preferences"
msgstr "計算に関するプレファレンス(好みの設定)を設定します"
-#: clientgui/AdvancedFrame.cpp:608
+#: clientgui/AdvancedFrame.cpp:610
msgid "Exclusive applications..."
msgstr "排他的なアプリケーション..."
-#: clientgui/AdvancedFrame.cpp:609
+#: clientgui/AdvancedFrame.cpp:611
msgid "Configure exclusive applications"
msgstr "排他的なアプリケーションの設定"
-#: clientgui/AdvancedFrame.cpp:614
+#: clientgui/AdvancedFrame.cpp:616
msgid "Select columns..."
msgstr "カラムの選択…"
-#: clientgui/AdvancedFrame.cpp:615
+#: clientgui/AdvancedFrame.cpp:617
msgid "Select which columns to display"
msgstr "どのカラムを表示するか選択します"
-#: clientgui/AdvancedFrame.cpp:619
+#: clientgui/AdvancedFrame.cpp:621
msgid "Event Log options...\tCtrl+Shift+F"
msgstr "イベント・ログのオプション...\tCtrl+Shift+F"
-#: clientgui/AdvancedFrame.cpp:620
+#: clientgui/AdvancedFrame.cpp:622
msgid "Enable or disable various diagnostic messages"
msgstr "さまざまな診断メッセージを有効または無効にする"
-#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
+#: clientgui/AdvancedFrame.cpp:626 clientgui/sg_BoincSimpleFrame.cpp:197
msgid "&Other options..."
msgstr "その他のオプション(&O)..."
-#: clientgui/AdvancedFrame.cpp:625
+#: clientgui/AdvancedFrame.cpp:627
msgid "Configure display options and network settings"
msgstr "表示オプションとネットワーク設定を構成します"
-#: clientgui/AdvancedFrame.cpp:630
+#: clientgui/AdvancedFrame.cpp:632
msgid "Read config files"
msgstr "設定ファイルを読み込む"
-#: clientgui/AdvancedFrame.cpp:631
+#: clientgui/AdvancedFrame.cpp:633
msgid ""
"Read configuration info from cc_config.xml and any app_config.xml files"
msgstr "cc_config.xml といずれかの app_config.xml ファイルから設定情報を読み込みます"
-#: clientgui/AdvancedFrame.cpp:635
+#: clientgui/AdvancedFrame.cpp:637
msgid "Read local prefs file"
msgstr "ローカル・プレファレンスファイルを読み込む"
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:638
msgid "Read preferences from global_prefs_override.xml."
msgstr "global_prefs_override.xml からプレファレンス(好みの設定)を読み込みます"
-#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
+#: clientgui/AdvancedFrame.cpp:646 clientgui/sg_BoincSimpleFrame.cpp:219
#, c-format
msgid "%s &help"
msgstr "%s のヘルプ(&H)"
-#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
+#: clientgui/AdvancedFrame.cpp:650 clientgui/sg_BoincSimpleFrame.cpp:223
#, c-format
msgid "Show information about %s"
msgstr "%s に関する情報を表示します"
-#: clientgui/AdvancedFrame.cpp:658
+#: clientgui/AdvancedFrame.cpp:660
#, c-format
msgid "&%s help"
msgstr "&%s のヘルプ"
-#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
+#: clientgui/AdvancedFrame.cpp:664 clientgui/sg_BoincSimpleFrame.cpp:237
#, c-format
msgid "Show information about the %s"
msgstr "%s に関する情報を表示します"
-#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
+#: clientgui/AdvancedFrame.cpp:675 clientgui/sg_BoincSimpleFrame.cpp:247
#, c-format
msgid "%s &web site"
msgstr "%s のウェブサイト(&W)"
-#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
+#: clientgui/AdvancedFrame.cpp:679 clientgui/sg_BoincSimpleFrame.cpp:251
#, c-format
msgid "Show information about BOINC and %s"
msgstr "BOINC および %s に関する情報を表示します"
-#: clientgui/AdvancedFrame.cpp:688 clientgui/BOINCTaskBar.cpp:541
+#: clientgui/AdvancedFrame.cpp:690 clientgui/BOINCTaskBar.cpp:541
#: clientgui/sg_BoincSimpleFrame.cpp:262
#, c-format
msgid "&About %s..."
msgstr "%s について(&A)..."
-#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
+#: clientgui/AdvancedFrame.cpp:696 clientgui/sg_BoincSimpleFrame.cpp:268
msgid "Licensing and copyright information."
msgstr "ライセンスと著作権情報を表示します"
-#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
+#: clientgui/AdvancedFrame.cpp:703 clientgui/sg_BoincSimpleFrame.cpp:275
msgid "&File"
msgstr "ファイル(&F)"
-#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
+#: clientgui/AdvancedFrame.cpp:707 clientgui/sg_BoincSimpleFrame.cpp:279
msgid "&View"
msgstr "表示(&V)"
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:711
msgid "&Activity"
msgstr "アクティビティ(&A)"
-#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
+#: clientgui/AdvancedFrame.cpp:715 clientgui/sg_BoincSimpleFrame.cpp:283
msgid "&Options"
msgstr "オプション(&O)"
-#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
+#: clientgui/AdvancedFrame.cpp:719 clientgui/sg_BoincSimpleFrame.cpp:287
msgid "&Tools"
msgstr "ツール(&T)"
-#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/AdvancedFrame.cpp:723 clientgui/sg_BoincSimpleFrame.cpp:291
#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
msgid "&Help"
msgstr "ヘルプ(&H)"
-#: clientgui/AdvancedFrame.cpp:1235
+#: clientgui/AdvancedFrame.cpp:1237
#, c-format
msgid "%s - Stop using %s"
msgstr "%s - %s の使用をやめる"
-#: clientgui/AdvancedFrame.cpp:1240
+#: clientgui/AdvancedFrame.cpp:1242
#, c-format
msgid ""
"If you stop using %s,\n"
@@ -578,39 +579,39 @@ msgid ""
"Do you want to stop using %s?"
msgstr "%s の利用を停止しても、現在参加しているプロジェクトに影響はありませんが、\nプロジェクトを手動で管理しなければならなくなります。\n本当に %s の利用を停止しますか？"
-#: clientgui/AdvancedFrame.cpp:1469
+#: clientgui/AdvancedFrame.cpp:1471
#, c-format
msgid "%s - Shut down the current client..."
msgstr "%s - 現在接続しているクライアントをシャットダウンします..."
-#: clientgui/AdvancedFrame.cpp:1478
+#: clientgui/AdvancedFrame.cpp:1480
#, c-format
msgid ""
"%s will shut down the current client\n"
"and prompt you for another host to connect to."
msgstr "%s は、現在接続しているクライアントをシャットダウンし、\n別の計算機に接続するよう促します。"
-#: clientgui/AdvancedFrame.cpp:1881 clientgui/DlgAbout.cpp:119
+#: clientgui/AdvancedFrame.cpp:1883 clientgui/DlgAbout.cpp:119
#, c-format
msgid "%s"
msgstr "%s"
-#: clientgui/AdvancedFrame.cpp:1890
+#: clientgui/AdvancedFrame.cpp:1892
#, c-format
msgid "%s has successfully added %s"
msgstr "%s は %s の追加に成功しました"
-#: clientgui/AdvancedFrame.cpp:2026
+#: clientgui/AdvancedFrame.cpp:2028
#, c-format
msgid "%s - (%s)"
msgstr "%s - (%s)"
-#: clientgui/AdvancedFrame.cpp:2030
+#: clientgui/AdvancedFrame.cpp:2032
#, c-format
msgid "Connecting to %s"
msgstr "%s に接続中"
-#: clientgui/AdvancedFrame.cpp:2033
+#: clientgui/AdvancedFrame.cpp:2035
#, c-format
msgid "Connected to %s (%s)"
msgstr "%s (%s)に接続済み"
@@ -658,7 +659,7 @@ msgstr "%s を終了(&X)"
msgid "%s - Communication"
msgstr "%s - 通信"
-#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:168
#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:355
msgid "Cancel"
@@ -738,12 +739,12 @@ msgstr "%s は現在 %s クライアントと繋がっていません。メニ
msgid "Project web pages"
msgstr "プロジェクトのウェブページ"
-#: clientgui/BOINCClientManager.cpp:573
+#: clientgui/BOINCClientManager.cpp:545
#, c-format
msgid "%s - Unexpected Exit"
msgstr "%s - 予期しない終了"
-#: clientgui/BOINCClientManager.cpp:583
+#: clientgui/BOINCClientManager.cpp:555
#, c-format
msgid ""
"The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -794,7 +795,7 @@ msgstr "%s はインターネットとの接続切断に成功しました。"
msgid "%s failed to disconnected from the Internet."
msgstr "%s はインターネットとの接続切断に失敗しました。"
-#: clientgui/BOINCGUIApp.cpp:351
+#: clientgui/BOINCGUIApp.cpp:356
#, c-format
msgid ""
"You currently are not authorized to manage the client.\n"
@@ -807,90 +808,94 @@ msgid ""
" user group."
msgstr "現在のところあなたにはこのクライアントを管理する権限がありません。\n%s をこのユーザーで動作させるには、 %s をインストールし直し、管理者権限のないユーザーについての質問に「はい」と答えてください。もしくは管理者に連絡して、'boinc_users' ローカルユーザーグループにあなたを加えてください。"
-#: clientgui/BOINCGUIApp.cpp:357
+#: clientgui/BOINCGUIApp.cpp:362
#, c-format
msgid ""
"%s ownership or permissions are not set properly; please reinstall %s.\n"
"(Error code %d"
msgstr "%s に対する所有権あるいは許可情報が正しく設定されていません。%s をインストールし直してください。\n(エラーコード %d"
-#: clientgui/BOINCGUIApp.cpp:363
+#: clientgui/BOINCGUIApp.cpp:368
msgid " at "
msgstr "で"
-#: clientgui/BOINCGUIApp.cpp:366 clientgui/MainDocument.cpp:2494
-#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
+#: clientgui/BOINCGUIApp.cpp:371 clientgui/MainDocument.cpp:2495
+#: clientgui/MainDocument.cpp:2554 clientgui/ViewTransfers.cpp:887
msgid ")"
msgstr ")"
-#: clientgui/BOINCGUIApp.cpp:396
+#: clientgui/BOINCGUIApp.cpp:401
msgid ""
"A reboot is required in order for BOINC to run properly.\n"
"Please reboot your computer and try again."
msgstr "BOINC を正しく実行するためには再起動が必要です。\nあなたのコンピュータを再起動してから、もう一度試してください。"
-#: clientgui/BOINCGUIApp.cpp:397 clientgui/DlgAbout.cpp:153
+#: clientgui/BOINCGUIApp.cpp:402 clientgui/DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "BOINC マネージャ"
-#: clientgui/BOINCGUIApp.cpp:658
+#: clientgui/BOINCGUIApp.cpp:664
msgid "BOINC Manager was started by the operating system automatically"
msgstr "BOINC マネージャはオペレーティング・システムにより自動的に起動されました。"
-#: clientgui/BOINCGUIApp.cpp:660
+#: clientgui/BOINCGUIApp.cpp:666
msgid "Startup BOINC so only the system tray icon is visible"
msgstr "BOINC 起動時に、システムトレイのアイコンだけを表示します"
-#: clientgui/BOINCGUIApp.cpp:662
+#: clientgui/BOINCGUIApp.cpp:668
msgid "Directory containing the BOINC Client executable"
msgstr "BOINC クライアントの実行可能ファイルがあるディレクトリ"
-#: clientgui/BOINCGUIApp.cpp:663
+#: clientgui/BOINCGUIApp.cpp:669
msgid "BOINC data directory"
msgstr "BOINC 用データディレクトリ"
-#: clientgui/BOINCGUIApp.cpp:665
+#: clientgui/BOINCGUIApp.cpp:671
msgid "Host name or IP address"
msgstr "ホスト名または IPアドレス"
-#: clientgui/BOINCGUIApp.cpp:666
+#: clientgui/BOINCGUIApp.cpp:672
msgid "GUI RPC port number"
msgstr "GUI用 RPC のポート番号"
-#: clientgui/BOINCGUIApp.cpp:667
+#: clientgui/BOINCGUIApp.cpp:673
msgid "Password"
msgstr "パスワード:"
-#: clientgui/BOINCGUIApp.cpp:668
+#: clientgui/BOINCGUIApp.cpp:674
msgid "Startup BOINC with these optional arguments"
msgstr "これらのオプション引数を付けて BOINC を起動します"
-#: clientgui/BOINCGUIApp.cpp:669
+#: clientgui/BOINCGUIApp.cpp:675
msgid "disable BOINC security users and permissions"
msgstr "BOINC のユーザとアクセス許可についてのセキュリティを無効にします"
-#: clientgui/BOINCGUIApp.cpp:670
+#: clientgui/BOINCGUIApp.cpp:676
msgid "set skin debugging mode to enable skin manager error messages"
msgstr "skin マネージャのエラーメッセージを有効にするために、skin debugging モードにします"
-#: clientgui/BOINCGUIApp.cpp:671
+#: clientgui/BOINCGUIApp.cpp:677
msgid "multiple instances of BOINC Manager allowed"
msgstr "BOINC Manager の複数インスタンス起動を許可"
-#: clientgui/BOINCGUIApp.cpp:673
+#: clientgui/BOINCGUIApp.cpp:679
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "未使用: XCode 4.2のバグ回避策"
+#: clientgui/BOINCGUIApp.cpp:681
+msgid "Not run the daemon"
+msgstr "バックグラウンドでの動作は実行されません。"
+
#. These are just special tags so deal with them in a special way
-#: clientgui/BOINCGUIApp.cpp:920
+#: clientgui/BOINCGUIApp.cpp:931
msgid "(Automatic Detection)"
msgstr "(言語の自動判別)"
-#: clientgui/BOINCGUIApp.cpp:921
+#: clientgui/BOINCGUIApp.cpp:932
msgid "(Unknown)"
msgstr "(不明)"
-#: clientgui/BOINCGUIApp.cpp:922
+#: clientgui/BOINCGUIApp.cpp:933
msgid "(User Defined)"
msgstr "(ユーザー定義)"
@@ -918,7 +923,7 @@ msgstr "GPU を休止"
msgid "E&xit"
msgstr "終了(&X)"
-#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:806
+#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:808
#: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
#: clientgui/sg_ProjectCommandPopup.cpp:125
#: clientgui/sg_TaskCommandPopup.cpp:118
@@ -1076,44 +1081,48 @@ msgid "For more information, visit "
msgstr "詳細については、以下を訪問してください"
#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:410
#: clientgui/DlgSelectComputer.cpp:163
msgid "&OK"
msgstr "OK(&O)"
-#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:773
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:773
msgid "Invalid number"
msgstr "無効な数字"
-#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:774
+#: clientgui/DlgAdvPreferences.cpp:685 clientgui/sg_DlgPreferences.cpp:774
msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
msgstr "無効な時間です、値は 0:00 から 24:00 の間、書式は HH:MM でなければなりません"
-#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:775
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:775
msgid "Start time must be different from end time"
msgstr "開始時間は終了時間と異ならなければなりません"
-#: clientgui/DlgAdvPreferences.cpp:685
+#: clientgui/DlgAdvPreferences.cpp:687
msgid "Number must be between 0 and 10"
msgstr "数字は 0 から 10 の間でなければなりません"
-#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:776
+#: clientgui/DlgAdvPreferences.cpp:688 clientgui/sg_DlgPreferences.cpp:776
msgid "Number must be between 0 and 100"
msgstr "数字は 0 から 100 の間でなければなりません"
-#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:847
+#: clientgui/DlgAdvPreferences.cpp:689
+msgid "Number must be between 1 and 100"
+msgstr "数は 0 から 100 の間でなければなりません"
+
+#: clientgui/DlgAdvPreferences.cpp:947 clientgui/sg_DlgPreferences.cpp:847
msgid "invalid input value detected"
msgstr "無効な入力値が検出されました"
-#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:849
+#: clientgui/DlgAdvPreferences.cpp:959 clientgui/sg_DlgPreferences.cpp:849
msgid "Validation Error"
msgstr "検証エラー"
-#: clientgui/DlgAdvPreferences.cpp:1158
+#: clientgui/DlgAdvPreferences.cpp:1171
msgid "Discard local preferences and use web-based preferences?"
msgstr "ローカル・プレファレンスを放棄してウェブ上のプレファレンスを使用しますか？"
-#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1175
+#: clientgui/DlgAdvPreferences.cpp:1172 clientgui/sg_DlgPreferences.cpp:1175
msgid "Confirmation"
msgstr "確認"
@@ -1136,96 +1145,81 @@ msgstr "下記のウェブ上のプレファレンスを使用しています:"
msgid "Set values and click OK to use local preferences instead."
msgstr "代わりにローカル・プレファレンスを使用する場合、値を設定しOKをクリックします。"
-#: clientgui/DlgAdvPreferencesBase.cpp:116
-msgid ""
-"This dialog controls preferences for this computer only.\n"
-"Click OK to set preferences.\n"
-"Click Clear to restore web-based settings."
-msgstr "このダイアログでは、このコンピュータだけに適用するプレファレンスを管理します。\n設定するにはOKをクリックしてください。\nプロジェクトのウェブサイトで設定した値に戻すなら、[クリア]をクリックしてください。"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "Clear"
-msgstr "クリア"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:120
-msgid "Clear all local preferences and close the dialog."
-msgstr "このコンピュータだけに適用するプレファレンスを全てクリアして、ダイアログを終了します。"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:215
+#: clientgui/DlgAdvPreferencesBase.cpp:115 clientgui/sg_DlgPreferences.cpp:215
msgid "Use web prefs"
msgstr "ウェブのプレファレンスを使用する"
-#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
+#: clientgui/DlgAdvPreferencesBase.cpp:116 clientgui/sg_DlgPreferences.cpp:216
msgid "Restore web-based preferences and close the dialog."
msgstr "ウェブ上のプレファレンスを復元しダイアログを終了します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:148
-#: clientgui/DlgAdvPreferencesBase.cpp:692
+#: clientgui/DlgAdvPreferencesBase.cpp:140
+#: clientgui/DlgAdvPreferencesBase.cpp:684
msgid "Computing"
msgstr "計算"
#. Network schedule
-#: clientgui/DlgAdvPreferencesBase.cpp:151
-#: clientgui/DlgAdvPreferencesBase.cpp:894
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:886
msgid "Network"
msgstr "ネットワーク"
-#: clientgui/DlgAdvPreferencesBase.cpp:154
+#: clientgui/DlgAdvPreferencesBase.cpp:146
msgid "Disk and memory"
msgstr "ディスクとメモリ"
-#: clientgui/DlgAdvPreferencesBase.cpp:157
+#: clientgui/DlgAdvPreferencesBase.cpp:149
msgid "Daily schedules"
msgstr "日ごとのスケジュール"
-#: clientgui/DlgAdvPreferencesBase.cpp:170
+#: clientgui/DlgAdvPreferencesBase.cpp:162
#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:351
msgid "OK"
msgstr "OK"
-#: clientgui/DlgAdvPreferencesBase.cpp:171
+#: clientgui/DlgAdvPreferencesBase.cpp:163
msgid "Save all values and close the dialog."
msgstr "すべての値を保存して、ダイアログを終了します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:169
msgid "Close the dialog without saving."
msgstr "保存せずにダイアログを終了します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:181 clientgui/DlgExclusiveApps.cpp:157
+#: clientgui/DlgAdvPreferencesBase.cpp:173 clientgui/DlgExclusiveApps.cpp:157
#: clientgui/Localization.cpp:35 clientgui/Localization.cpp:121
#: clientgui/Localization.cpp:139 clientgui/sg_BoincSimpleFrame.cpp:930
#: clientgui/sg_DlgPreferences.cpp:361
msgid "Help"
msgstr "ヘルプ"
-#: clientgui/DlgAdvPreferencesBase.cpp:182
+#: clientgui/DlgAdvPreferencesBase.cpp:174
msgid "Shows the preferences web page."
msgstr "プレファレンス(好みの設定)のウェブページを開きます。"
-#: clientgui/DlgAdvPreferencesBase.cpp:244
-#: clientgui/DlgAdvPreferencesBase.cpp:471
+#: clientgui/DlgAdvPreferencesBase.cpp:236
+#: clientgui/DlgAdvPreferencesBase.cpp:463
msgid "Usage limits"
msgstr "使用量の制限"
-#: clientgui/DlgAdvPreferencesBase.cpp:249
+#: clientgui/DlgAdvPreferencesBase.cpp:241
#, no-c-format
msgid ""
"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
"on an 8-core CPU."
msgstr "他のアプリケーションのためにいくつかの CPU を自由に保ちます。例: 75%であれば、8コアCPUの場合そのうち6コアを使用するということです。"
-#: clientgui/DlgAdvPreferencesBase.cpp:251
-#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:284
+#: clientgui/DlgAdvPreferencesBase.cpp:243
+#: clientgui/DlgAdvPreferencesBase.cpp:255 clientgui/sg_DlgPreferences.cpp:284
msgid "Use at most"
msgstr "最大で"
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:248
#, no-c-format
msgid "% of the CPUs"
msgstr "% の CPUコアまで"
-#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:282
+#: clientgui/DlgAdvPreferencesBase.cpp:253 clientgui/sg_DlgPreferences.cpp:282
#, no-c-format
msgid ""
"Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1233,355 +1227,363 @@ msgid ""
"and repeat."
msgstr "CPU温度とエネルギー使用量を抑制するために数秒ごとに計算を一時停止/再開する。例: 75%であれば、3秒計算・1秒一時停止を繰り返すということです。"
-#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:289
+#: clientgui/DlgAdvPreferencesBase.cpp:260 clientgui/sg_DlgPreferences.cpp:289
#, no-c-format
msgid "% of CPU time"
msgstr "% の CPU 時間まで"
-#: clientgui/DlgAdvPreferencesBase.cpp:275
+#: clientgui/DlgAdvPreferencesBase.cpp:267
msgid "When to suspend"
msgstr "いつ一時停止するか"
-#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
+#: clientgui/DlgAdvPreferencesBase.cpp:273 clientgui/sg_DlgPreferences.cpp:237
msgid "Suspend when computer is on battery"
msgstr "コンピュータがバッテリーで稼働している時一時停止"
-#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
+#: clientgui/DlgAdvPreferencesBase.cpp:276 clientgui/sg_DlgPreferences.cpp:233
msgid ""
"Check this to suspend computing on portables when running on battery power."
msgstr "携帯用機器でバッテリー電源で動作している時計算を一時停止するには、ここにチェックを入れてください。"
-#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:282 clientgui/sg_DlgPreferences.cpp:251
msgid "Suspend when computer is in use"
msgstr "コンピュータを使用中は、計算を一時停止"
-#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
+#: clientgui/DlgAdvPreferencesBase.cpp:285 clientgui/sg_DlgPreferences.cpp:247
msgid ""
"Check this to suspend computing and file transfers when you're using the "
"computer."
msgstr "あなたがコンピュータを使用している時計算とファイル転送を一時停止するには、ここにチェックを入れます。"
-#: clientgui/DlgAdvPreferencesBase.cpp:299
+#: clientgui/DlgAdvPreferencesBase.cpp:291
msgid "Suspend GPU computing when computer is in use"
msgstr "コンピュータを使用中は、GPU による計算を一時停止"
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#: clientgui/DlgAdvPreferencesBase.cpp:294
msgid "Check this to suspend GPU computing when you're using the computer."
msgstr "あなたがコンピュータを使用している時 GPU による計算を一時停止するには、ここにチェックを入れます。"
#. min idle time
-#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
+#: clientgui/DlgAdvPreferencesBase.cpp:299 clientgui/sg_DlgPreferences.cpp:262
msgid "This determines when the computer is considered 'in use'."
msgstr "ここではコンピュータがどんな場合に「使用中」とみなすか決定します。"
#. context: 'In use' means mouse/keyboard input in last ___ minutes
-#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
+#: clientgui/DlgAdvPreferencesBase.cpp:304 clientgui/sg_DlgPreferences.cpp:266
msgid "'In use' means mouse/keyboard input in last"
msgstr "「使用中」とは、マウス・キーボード入力が右の時間内にあった場合のことです:"
#. context: 'In use' means mouse/keyboard input in last ___ minutes
#. context: Switch between tasks every ___ minutes
-#: clientgui/DlgAdvPreferencesBase.cpp:323
-#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
+#: clientgui/DlgAdvPreferencesBase.cpp:315
+#: clientgui/DlgAdvPreferencesBase.cpp:413 clientgui/sg_DlgPreferences.cpp:274
msgid "minutes"
msgstr "分"
-#: clientgui/DlgAdvPreferencesBase.cpp:331
+#: clientgui/DlgAdvPreferencesBase.cpp:323
msgid "Suspend when non-BOINC CPU usage is above"
msgstr "BOINC 以外のCPU使用率が超える場合に一時停止"
-#: clientgui/DlgAdvPreferencesBase.cpp:333
+#: clientgui/DlgAdvPreferencesBase.cpp:325
msgid "Suspend computing when your computer is busy running other programs."
msgstr "コンピュータが他のプログラムによってビジー状態にある時、計算を一時停止します。"
+#: clientgui/DlgAdvPreferencesBase.cpp:339
+msgid "To suspend by time of day, see the \"Daily Schedules\" section."
+msgstr "一日の時間によって中断するには、「毎日のスケジュール」を参照してください。"
+
#. Context: heading for a group of miscellaneous preferences
-#: clientgui/DlgAdvPreferencesBase.cpp:357
-#: clientgui/DlgAdvPreferencesBase.cpp:524
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+#: clientgui/DlgAdvPreferencesBase.cpp:516
msgid "Other"
msgstr "その他"
#. buffer sizes
-#: clientgui/DlgAdvPreferencesBase.cpp:363
+#: clientgui/DlgAdvPreferencesBase.cpp:355
msgid "Store at least enough tasks to keep the computer busy for this long."
msgstr "長期間コンピュータのビジー状態を保つために、最低に見積もっても十分なタスクを蓄えておきます。"
#. context: Store at least ___ days of work
-#: clientgui/DlgAdvPreferencesBase.cpp:367
+#: clientgui/DlgAdvPreferencesBase.cpp:359
msgid "Store at least"
msgstr "最低限の備蓄量:"
#. context: Store at least ___ days of work
#. context: Store up to an additional ___ days of work
-#: clientgui/DlgAdvPreferencesBase.cpp:378
-#: clientgui/DlgAdvPreferencesBase.cpp:400
+#: clientgui/DlgAdvPreferencesBase.cpp:370
+#: clientgui/DlgAdvPreferencesBase.cpp:392
msgid "days of work"
msgstr "日分の仕事"
-#: clientgui/DlgAdvPreferencesBase.cpp:384
+#: clientgui/DlgAdvPreferencesBase.cpp:376
msgid ""
"Store additional tasks above the minimum level. Determines how much work is"
" requested when contacting a project."
msgstr "最小レベル以上の追加タスクを備蓄してください。プロジェクトに連絡する際に要求される作業の量を決定します。"
#. context: Store up to an additional ___ days of work
-#: clientgui/DlgAdvPreferencesBase.cpp:388
+#: clientgui/DlgAdvPreferencesBase.cpp:380
msgid "Store up to an additional"
msgstr "追加で下記の分まで備蓄:"
-#: clientgui/DlgAdvPreferencesBase.cpp:407
+#: clientgui/DlgAdvPreferencesBase.cpp:399
#, c-format
msgid "If you run several projects, %s may switch between them this often."
msgstr "いくつかのプロジェクトを動作させる場合、%s はこの間隔でそれらプロジェクトを切り替えるでしょう"
#. context: Switch between tasks every ___ minutes
-#: clientgui/DlgAdvPreferencesBase.cpp:412
+#: clientgui/DlgAdvPreferencesBase.cpp:404
msgid "Switch between tasks every"
msgstr "タスクの切り替え間隔"
-#: clientgui/DlgAdvPreferencesBase.cpp:427
+#: clientgui/DlgAdvPreferencesBase.cpp:419
msgid ""
"This controls how often tasks save their state to disk, so that they can be "
"restarted later."
msgstr "ここではタスクが後ほど再起動されることが出来るようにするために、ディスクにその状態を保存する間隔を設定します。"
#. context: Request tasks to checkpoint at most every ___ seconds
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#: clientgui/DlgAdvPreferencesBase.cpp:423
msgid "Request tasks to checkpoint at most every"
msgstr "タスクにチェックポイント書き込みを要求する最大間隔"
#. context: Request tasks to checkpoint at most every ___ seconds
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:432
msgid "seconds"
msgstr "秒毎"
#. upload/download rates
-#: clientgui/DlgAdvPreferencesBase.cpp:477
+#: clientgui/DlgAdvPreferencesBase.cpp:469
msgid "Limit the download rate of file transfers."
msgstr "ファイル転送のダウンロード速度を制限します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: clientgui/DlgAdvPreferencesBase.cpp:470
msgid "Limit download rate to"
msgstr "ダウンロード速度を下記に制限"
-#: clientgui/DlgAdvPreferencesBase.cpp:482
-#: clientgui/DlgAdvPreferencesBase.cpp:491
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+#: clientgui/DlgAdvPreferencesBase.cpp:483
msgid "KB/second"
msgstr "KB/秒"
-#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:478
msgid "Limit the upload rate of file transfers."
msgstr "ファイル転送のアップロード速度を制限します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: clientgui/DlgAdvPreferencesBase.cpp:479
msgid "Limit upload rate to"
msgstr "アップロード速度を下記に制限"
-#: clientgui/DlgAdvPreferencesBase.cpp:498
+#: clientgui/DlgAdvPreferencesBase.cpp:490
#, c-format
msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
msgstr "例: %s は多くとも30日ごとに2000MBのデータまで転送するはずです。"
-#: clientgui/DlgAdvPreferencesBase.cpp:500
+#: clientgui/DlgAdvPreferencesBase.cpp:492
msgid "Limit usage to"
msgstr "使用限度量"
-#: clientgui/DlgAdvPreferencesBase.cpp:504
+#: clientgui/DlgAdvPreferencesBase.cpp:496
msgid "MB every"
msgstr "MB/"
-#: clientgui/DlgAdvPreferencesBase.cpp:508
+#: clientgui/DlgAdvPreferencesBase.cpp:500
msgid "days"
msgstr "日"
-#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:505
+msgid "To limit transfers by time of day, see the \"Daily Schedules\" section."
+msgstr "一日の時間によって転送を制限するには、「毎日のスケジュール」を参照してください。"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:522
#, c-format
msgid ""
"Check this only if your Internet provider modifies image files. Skipping "
"verification reduces the security of %s."
msgstr "インターネットプロバイダが画像ファイルを変更する場合はチェックを入れてください。検証をスキップすると %s のセキュリティレベルは低下します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: clientgui/DlgAdvPreferencesBase.cpp:524
msgid "Skip data verification for image files"
msgstr "画像ファイルのデータ検証をスキップする"
-#: clientgui/DlgAdvPreferencesBase.cpp:536
+#: clientgui/DlgAdvPreferencesBase.cpp:528
msgid "Confirm before connecting to Internet"
msgstr "インターネットに接続する前に確認する"
-#: clientgui/DlgAdvPreferencesBase.cpp:537
-#: clientgui/DlgAdvPreferencesBase.cpp:541
+#: clientgui/DlgAdvPreferencesBase.cpp:529
+#: clientgui/DlgAdvPreferencesBase.cpp:533
msgid "Useful only if you have a modem, ISDN or VPN connection."
msgstr "モデム、ISDN または VPN 接続を使っているときのみ便利です。"
-#: clientgui/DlgAdvPreferencesBase.cpp:540
+#: clientgui/DlgAdvPreferencesBase.cpp:532
msgid "Disconnect when done"
msgstr "終わったら切断"
-#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
+#: clientgui/DlgAdvPreferencesBase.cpp:559 clientgui/ViewResources.cpp:116
msgid "Disk"
msgstr "ディスク"
-#: clientgui/DlgAdvPreferencesBase.cpp:572
+#: clientgui/DlgAdvPreferencesBase.cpp:564
#, c-format
msgid "%s will use the most restrictive of these settings:"
msgstr "%sは、これら3つの設定のうち最も制限的なものを使用します:"
-#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:333
+#: clientgui/DlgAdvPreferencesBase.cpp:570 clientgui/sg_DlgPreferences.cpp:333
#, c-format
msgid "Limit the total amount of disk space used by %s."
msgstr "%sによって使用されるディスク領域の合計を制限します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:581
-#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:336
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:597 clientgui/sg_DlgPreferences.cpp:336
msgid "Use no more than"
msgstr "使用上限:"
-#: clientgui/DlgAdvPreferencesBase.cpp:585
+#: clientgui/DlgAdvPreferencesBase.cpp:577
msgid "GB"
msgstr "GB"
-#: clientgui/DlgAdvPreferencesBase.cpp:590
+#: clientgui/DlgAdvPreferencesBase.cpp:582
#, c-format
msgid ""
"Limit disk usage to leave this much free space on the volume where %s stores"
" data."
msgstr "%s のデータを格納するボリュームでこれだけの空きスペースを残してディスク使用量を制限します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:593
+#: clientgui/DlgAdvPreferencesBase.cpp:585
msgid "Leave at least"
msgstr "最低限の空き領域"
-#: clientgui/DlgAdvPreferencesBase.cpp:597
+#: clientgui/DlgAdvPreferencesBase.cpp:589
msgid "GB free"
msgstr "GB の空き領域"
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:594
#, c-format
msgid ""
"Limit the percentage of disk space used by %s on the volume where it stores "
"data."
msgstr "データを格納するボリュームで %s が使用するディスク領域の割合を制限します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:610
+#: clientgui/DlgAdvPreferencesBase.cpp:602
#, no-c-format
msgid "% of total"
msgstr "% まで(全体比)"
-#: clientgui/DlgAdvPreferencesBase.cpp:617
+#: clientgui/DlgAdvPreferencesBase.cpp:609
msgid "Memory"
msgstr "メモリ"
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: clientgui/DlgAdvPreferencesBase.cpp:614
#, c-format
msgid "Limit the memory used by %s when you're using the computer."
msgstr "あなたがコンピュータを使用している時 %s よって使用されるメモリを制限します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:624
+#: clientgui/DlgAdvPreferencesBase.cpp:616
msgid "When computer is in use, use at most"
msgstr "コンピュータを使用中、最大使用時でも"
-#: clientgui/DlgAdvPreferencesBase.cpp:630
-#: clientgui/DlgAdvPreferencesBase.cpp:642
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: clientgui/DlgAdvPreferencesBase.cpp:634
+#: clientgui/DlgAdvPreferencesBase.cpp:650
#, no-c-format
msgid "%"
msgstr "%"
-#: clientgui/DlgAdvPreferencesBase.cpp:635
+#: clientgui/DlgAdvPreferencesBase.cpp:627
#, c-format
msgid "Limit the memory used by %s when you're not using the computer."
msgstr "あなたがコンピュータを使用していない時 %s によって使用されるメモリを制限します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: clientgui/DlgAdvPreferencesBase.cpp:629
msgid "When computer is not in use, use at most"
msgstr "コンピュータが使用されていない時、最大使用時でも"
-#: clientgui/DlgAdvPreferencesBase.cpp:646
+#: clientgui/DlgAdvPreferencesBase.cpp:638
msgid "Leave non-GPU tasks in memory while suspended"
msgstr "一時停止中に、GPU向けでないタスクをメモリ上に残す"
-#: clientgui/DlgAdvPreferencesBase.cpp:647
+#: clientgui/DlgAdvPreferencesBase.cpp:639
msgid ""
"If checked, suspended tasks stay in memory, and resume with no work lost. If"
" unchecked, suspended tasks are removed from memory, and resume from their "
"last checkpoint."
msgstr "チェックを入れた場合、一時停止されたタスクはメモリにとどまり、仕事のロスなしで再開します。チェックを外した場合、一時停止されたタスクはメモリから取り除かれ、最後のチェックポイントから再開します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:651
+#: clientgui/DlgAdvPreferencesBase.cpp:643
#, c-format
msgid "Limit the swap space (page file) used by %s."
msgstr "%s によって使用されるスワップ領域(ページファイル)を制限します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:653
+#: clientgui/DlgAdvPreferencesBase.cpp:645
msgid "Page/swap file: use at most"
msgstr "ページ/スワップファイル: 最大使用時でも"
-#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:293
+#: clientgui/DlgAdvPreferencesBase.cpp:670 clientgui/sg_DlgPreferences.cpp:293
msgid "and"
msgstr "から"
-#: clientgui/DlgAdvPreferencesBase.cpp:679
+#: clientgui/DlgAdvPreferencesBase.cpp:671
msgid "to"
msgstr "から"
-#: clientgui/DlgAdvPreferencesBase.cpp:699 clientgui/sg_DlgPreferences.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:691 clientgui/sg_DlgPreferences.cpp:294
msgid "Compute only during a particular period each day."
msgstr "それぞれの日の特定範囲の時間帯だけ計算します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:702 clientgui/sg_DlgPreferences.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:694 clientgui/sg_DlgPreferences.cpp:297
msgid "Compute only between"
msgstr "下記の間だけ計算:"
-#: clientgui/DlgAdvPreferencesBase.cpp:726
-#: clientgui/DlgAdvPreferencesBase.cpp:910
+#: clientgui/DlgAdvPreferencesBase.cpp:718
+#: clientgui/DlgAdvPreferencesBase.cpp:902
msgid "Day-of-week override"
msgstr "曜日ごとの設定"
-#: clientgui/DlgAdvPreferencesBase.cpp:735
-#: clientgui/DlgAdvPreferencesBase.cpp:914
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:906
msgid "Override the times above on the selected days:"
msgstr "選択した日には上記の時間を設定解除します:"
-#: clientgui/DlgAdvPreferencesBase.cpp:758
-#: clientgui/DlgAdvPreferencesBase.cpp:931
+#: clientgui/DlgAdvPreferencesBase.cpp:750
+#: clientgui/DlgAdvPreferencesBase.cpp:923
msgid "Monday"
msgstr "月曜日"
-#: clientgui/DlgAdvPreferencesBase.cpp:785
-#: clientgui/DlgAdvPreferencesBase.cpp:946
+#: clientgui/DlgAdvPreferencesBase.cpp:777
+#: clientgui/DlgAdvPreferencesBase.cpp:938
msgid "Friday"
msgstr "金曜日"
-#: clientgui/DlgAdvPreferencesBase.cpp:800
-#: clientgui/DlgAdvPreferencesBase.cpp:959
+#: clientgui/DlgAdvPreferencesBase.cpp:792
+#: clientgui/DlgAdvPreferencesBase.cpp:951
msgid "Tuesday"
msgstr "火曜日"
-#: clientgui/DlgAdvPreferencesBase.cpp:815
-#: clientgui/DlgAdvPreferencesBase.cpp:974
+#: clientgui/DlgAdvPreferencesBase.cpp:807
+#: clientgui/DlgAdvPreferencesBase.cpp:966
msgid "Saturday"
msgstr "土曜日"
-#: clientgui/DlgAdvPreferencesBase.cpp:828
-#: clientgui/DlgAdvPreferencesBase.cpp:987
+#: clientgui/DlgAdvPreferencesBase.cpp:820
+#: clientgui/DlgAdvPreferencesBase.cpp:979
msgid "Wednesday"
msgstr "水曜日"
-#: clientgui/DlgAdvPreferencesBase.cpp:843
-#: clientgui/DlgAdvPreferencesBase.cpp:1002
+#: clientgui/DlgAdvPreferencesBase.cpp:835
+#: clientgui/DlgAdvPreferencesBase.cpp:994
msgid "Sunday"
msgstr "日曜日"
-#: clientgui/DlgAdvPreferencesBase.cpp:856
-#: clientgui/DlgAdvPreferencesBase.cpp:1015
+#: clientgui/DlgAdvPreferencesBase.cpp:848
+#: clientgui/DlgAdvPreferencesBase.cpp:1007
msgid "Thursday"
msgstr "木曜日"
-#: clientgui/DlgAdvPreferencesBase.cpp:898 clientgui/sg_DlgPreferences.cpp:315
+#: clientgui/DlgAdvPreferencesBase.cpp:890 clientgui/sg_DlgPreferences.cpp:315
msgid "Transfer files only during a particular period each day."
msgstr "それぞれの日の特定範囲の時間帯だけファイルを転送します。"
-#: clientgui/DlgAdvPreferencesBase.cpp:900 clientgui/sg_DlgPreferences.cpp:317
+#: clientgui/DlgAdvPreferencesBase.cpp:892 clientgui/sg_DlgPreferences.cpp:317
msgid "Transfer files only between"
msgstr "下記の間だけファイルを転送"
@@ -1622,7 +1624,7 @@ msgstr "%s - イベント・ログ"
#. Create List Pane Items
#: clientgui/DlgEventLog.cpp:237 clientgui/ViewMessages.cpp:117
-#: clientgui/ViewProjects.cpp:253 clientgui/ViewStatistics.cpp:411
+#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:411
#: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
#: clientgui/ViewWork.cpp:260
msgid "Project"
@@ -1704,7 +1706,7 @@ msgid "Add an application to this list"
msgstr "このリストにアプリケーションを追加"
#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
-#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:90
+#: clientgui/ViewProjects.cpp:234 clientgui/sg_ProjectCommandPopup.cpp:90
msgid "Remove"
msgstr "削除"
@@ -1804,7 +1806,7 @@ msgid "Remember this decision and do not show this dialog."
msgstr "この決定を記憶して再びこのダイアログを表示しない"
#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/DlgOptions.cpp:415 clientgui/DlgSelectComputer.cpp:168
#: clientgui/wizardex.cpp:378
msgid "&Cancel"
msgstr "キャンセル(&C)"
@@ -1835,8 +1837,8 @@ msgstr "初期値の確認"
#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
-msgid "Don't fetch tasks for "
-msgstr "このプロジェクトのタスクを取得しない: "
+msgid "Don't request tasks for "
+msgstr "タスクを要求しません。"
#: clientgui/DlgItemProperties.cpp:194
msgid "Project preference"
@@ -1854,379 +1856,398 @@ msgstr "プロジェクトには以下に適したアプリケーションがあ
msgid "Client configuration excludes "
msgstr "クライアントの環境設定を除外する"
-#: clientgui/DlgItemProperties.cpp:208
-msgid " work fetch deferred for"
-msgstr "仕事取得の保留時間:"
-
#: clientgui/DlgItemProperties.cpp:209
-msgid " work fetch deferral interval"
-msgstr "仕事取得処理の保留時間の間隔:"
+#, c-format
+msgid "%s task request deferred for"
+msgstr "%s タスク要求の延期"
+
+#: clientgui/DlgItemProperties.cpp:213
+#, c-format
+msgid "%s task request deferral interval"
+msgstr "%s タスク要求の遅延間隔"
#. set dialog title
-#: clientgui/DlgItemProperties.cpp:241
+#: clientgui/DlgItemProperties.cpp:247
msgid "Properties of project "
msgstr "プロジェクトのプロパティ "
#. layout controls
-#: clientgui/DlgItemProperties.cpp:245 clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:232
msgid "General"
msgstr "一般"
-#: clientgui/DlgItemProperties.cpp:246
+#: clientgui/DlgItemProperties.cpp:252
msgid "URL"
msgstr "URL"
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:253
msgid "User name"
msgstr "参加者名(ユーザー名)"
-#: clientgui/DlgItemProperties.cpp:248
+#: clientgui/DlgItemProperties.cpp:254
msgid "Team name"
msgstr "チームの名称"
-#: clientgui/DlgItemProperties.cpp:249 clientgui/ViewProjects.cpp:258
+#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:260
msgid "Resource share"
msgstr "リソース割り当て"
-#: clientgui/DlgItemProperties.cpp:251
+#: clientgui/DlgItemProperties.cpp:257
msgid "Scheduler RPC deferred for"
msgstr "スケジューラ RPC の保留時間:"
-#: clientgui/DlgItemProperties.cpp:254
+#: clientgui/DlgItemProperties.cpp:260
msgid "File downloads deferred for"
msgstr "ファイルダウンロード待機時間:"
-#: clientgui/DlgItemProperties.cpp:257
+#: clientgui/DlgItemProperties.cpp:263
msgid "File uploads deferred for"
msgstr "ファイルアップロード待機時間:"
-#: clientgui/DlgItemProperties.cpp:259
+#: clientgui/DlgItemProperties.cpp:265
msgid "Disk usage"
msgstr "ディスク領域"
-#: clientgui/DlgItemProperties.cpp:260
+#: clientgui/DlgItemProperties.cpp:266
msgid "Computer ID"
msgstr "コンピュータ ID"
-#: clientgui/DlgItemProperties.cpp:262
+#: clientgui/DlgItemProperties.cpp:268
msgid "Non CPU intensive"
msgstr "CPU を集中的に使わない"
-#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:264
-#: clientgui/DlgItemProperties.cpp:265 clientgui/DlgItemProperties.cpp:267
-#: clientgui/DlgItemProperties.cpp:270 clientgui/DlgItemProperties.cpp:279
-#: clientgui/DlgItemProperties.cpp:282 clientgui/DlgItemProperties.cpp:285
+#: clientgui/DlgItemProperties.cpp:268 clientgui/DlgItemProperties.cpp:270
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:276 clientgui/DlgItemProperties.cpp:285
+#: clientgui/DlgItemProperties.cpp:288 clientgui/DlgItemProperties.cpp:291
msgid "yes"
msgstr "はい"
-#: clientgui/DlgItemProperties.cpp:264
+#: clientgui/DlgItemProperties.cpp:270
msgid "Suspended via GUI"
msgstr "GUI 経由で保留中"
-#: clientgui/DlgItemProperties.cpp:264 clientgui/DlgItemProperties.cpp:265
+#: clientgui/DlgItemProperties.cpp:270 clientgui/DlgItemProperties.cpp:271
msgid "no"
msgstr "いいえ"
-#: clientgui/DlgItemProperties.cpp:265
-msgid "Don't request more work"
-msgstr "新しい仕事を要請しない"
+#: clientgui/DlgItemProperties.cpp:271
+msgid "Don't request tasks"
+msgstr "タスクを要求しません。"
-#: clientgui/DlgItemProperties.cpp:267
+#: clientgui/DlgItemProperties.cpp:273
msgid "Scheduler call in progress"
msgstr "スケジューラへ要求中"
-#: clientgui/DlgItemProperties.cpp:270
+#: clientgui/DlgItemProperties.cpp:276
msgid "Trickle-up pending"
msgstr "トリクルアップの送信保留あり"
-#: clientgui/DlgItemProperties.cpp:273 clientgui/DlgItemProperties.cpp:275
+#: clientgui/DlgItemProperties.cpp:279 clientgui/DlgItemProperties.cpp:281
msgid "Host location"
msgstr "計算機の所在場所"
-#: clientgui/DlgItemProperties.cpp:275
+#: clientgui/DlgItemProperties.cpp:281
msgid "default"
msgstr "デフォルト"
-#: clientgui/DlgItemProperties.cpp:279
+#: clientgui/DlgItemProperties.cpp:285
msgid "Added via account manager"
msgstr "アカウント･マネージャ経由での追加"
-#: clientgui/DlgItemProperties.cpp:282
+#: clientgui/DlgItemProperties.cpp:288
msgid "Remove when tasks done"
msgstr "タスクが完了したら削除する"
-#: clientgui/DlgItemProperties.cpp:285
+#: clientgui/DlgItemProperties.cpp:291
msgid "Ended"
msgstr "終了した"
-#: clientgui/DlgItemProperties.cpp:287
+#: clientgui/DlgItemProperties.cpp:293
msgid "Tasks completed"
msgstr "タスク完了"
-#: clientgui/DlgItemProperties.cpp:288
+#: clientgui/DlgItemProperties.cpp:294
msgid "Tasks failed"
msgstr "タスク失敗"
-#: clientgui/DlgItemProperties.cpp:290
+#: clientgui/DlgItemProperties.cpp:296
msgid "Credit"
msgstr "功績値"
-#: clientgui/DlgItemProperties.cpp:291
+#: clientgui/DlgItemProperties.cpp:297
msgid "User"
msgstr "参加者"
-#: clientgui/DlgItemProperties.cpp:298
+#: clientgui/DlgItemProperties.cpp:300 clientgui/DlgItemProperties.cpp:308
+#, c-format
+msgid "%0.2f total, %0.2f average"
+msgstr "%0.2f 合計 %0.2f 平均"
+
+#: clientgui/DlgItemProperties.cpp:305
msgid "Host"
msgstr "計算機"
-#: clientgui/DlgItemProperties.cpp:307
+#: clientgui/DlgItemProperties.cpp:315
msgid "Scheduling"
msgstr "スケジューリング"
-#: clientgui/DlgItemProperties.cpp:308
+#: clientgui/DlgItemProperties.cpp:316
msgid "Scheduling priority"
msgstr "スケジューリングの優先度"
-#: clientgui/DlgItemProperties.cpp:309
+#: clientgui/DlgItemProperties.cpp:317
msgid "CPU"
msgstr "CPU"
-#: clientgui/DlgItemProperties.cpp:333
+#: clientgui/DlgItemProperties.cpp:341
msgid "Duration correction factor"
msgstr "期間補正因子"
-#: clientgui/DlgItemProperties.cpp:341
+#: clientgui/DlgItemProperties.cpp:349
msgid "Last scheduler reply"
-msgstr "スケジューラの最後の返信"
+msgstr "最後のスケジューラの返信"
-#: clientgui/DlgItemProperties.cpp:352
+#: clientgui/DlgItemProperties.cpp:360
msgid "Properties of task "
msgstr "タスクのプロパティ"
-#: clientgui/DlgItemProperties.cpp:364 clientgui/ViewWork.cpp:266
+#: clientgui/DlgItemProperties.cpp:372 clientgui/ViewWork.cpp:266
msgid "Application"
msgstr "アプリケーション"
-#: clientgui/DlgItemProperties.cpp:365 clientgui/ViewWork.cpp:267
+#: clientgui/DlgItemProperties.cpp:373 clientgui/ViewWork.cpp:267
msgid "Name"
msgstr "名前"
-#: clientgui/DlgItemProperties.cpp:366
+#: clientgui/DlgItemProperties.cpp:374
msgid "State"
msgstr "状態"
-#: clientgui/DlgItemProperties.cpp:369
+#: clientgui/DlgItemProperties.cpp:377
msgid "Received"
msgstr "受信時刻 "
-#: clientgui/DlgItemProperties.cpp:372
+#: clientgui/DlgItemProperties.cpp:380
msgid "Report deadline"
msgstr "報告期限"
-#: clientgui/DlgItemProperties.cpp:374
+#: clientgui/DlgItemProperties.cpp:382
msgid "Resources"
msgstr "リソース"
-#: clientgui/DlgItemProperties.cpp:377
+#: clientgui/DlgItemProperties.cpp:385
msgid "Estimated computation size"
msgstr "推定計算量"
-#: clientgui/DlgItemProperties.cpp:380
+#: clientgui/DlgItemProperties.cpp:388
msgid "CPU time at last checkpoint"
msgstr "最新のチェックポイントでのCPU時間"
-#: clientgui/DlgItemProperties.cpp:381 clientgui/DlgItemProperties.cpp:407
+#: clientgui/DlgItemProperties.cpp:389 clientgui/DlgItemProperties.cpp:415
msgid "CPU time"
msgstr "CPU時間"
-#: clientgui/DlgItemProperties.cpp:383 clientgui/DlgItemProperties.cpp:408
+#: clientgui/DlgItemProperties.cpp:391 clientgui/DlgItemProperties.cpp:416
msgid "Elapsed time"
msgstr "経過時間"
-#: clientgui/DlgItemProperties.cpp:385
+#: clientgui/DlgItemProperties.cpp:393
msgid "Estimated time remaining"
msgstr "推定される残り時間"
-#: clientgui/DlgItemProperties.cpp:386
+#: clientgui/DlgItemProperties.cpp:394
msgid "Fraction done"
msgstr "仕事の計算完了率"
-#: clientgui/DlgItemProperties.cpp:387
+#: clientgui/DlgItemProperties.cpp:395
msgid "Virtual memory size"
msgstr "仮想メモリの大きさ"
-#: clientgui/DlgItemProperties.cpp:388
+#: clientgui/DlgItemProperties.cpp:396
msgid "Working set size"
msgstr "ワーキング・セットの大きさ"
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:398
msgid "Directory"
msgstr "ディレクトリ"
-#: clientgui/DlgItemProperties.cpp:393
+#: clientgui/DlgItemProperties.cpp:401
msgid "Process ID"
msgstr "プロセスID"
-#: clientgui/DlgItemProperties.cpp:399 clientgui/DlgItemProperties.cpp:401
-#: clientgui/DlgItemProperties.cpp:403
+#: clientgui/DlgItemProperties.cpp:407 clientgui/DlgItemProperties.cpp:409
+#: clientgui/DlgItemProperties.cpp:411
msgid "Progress rate"
msgstr "進捗率"
-#: clientgui/DlgItemProperties.cpp:399
+#: clientgui/DlgItemProperties.cpp:407
msgid "per hour"
msgstr "毎時"
-#: clientgui/DlgItemProperties.cpp:401
+#: clientgui/DlgItemProperties.cpp:409
msgid "per minute"
msgstr "毎分"
-#: clientgui/DlgItemProperties.cpp:403
+#: clientgui/DlgItemProperties.cpp:411
msgid "per second"
msgstr "毎秒"
-#: clientgui/DlgItemProperties.cpp:474 clientgui/ViewWork.cpp:1125
+#: clientgui/DlgItemProperties.cpp:419
+msgid "Executable"
+msgstr "実行可能ファイル"
+
+#: clientgui/DlgItemProperties.cpp:485 clientgui/ViewWork.cpp:1125
#: clientgui/sg_TaskPanel.cpp:828
msgid "Local: "
msgstr "ローカル:"
-#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:130 clientgui/DlgOptions.cpp:136
msgid "Options"
msgstr "オプション"
-#: clientgui/DlgOptions.cpp:178
+#: clientgui/DlgOptions.cpp:179
msgid "Language:"
msgstr "言語:"
-#: clientgui/DlgOptions.cpp:185
+#: clientgui/DlgOptions.cpp:186
msgid "What language should BOINC use?"
msgstr "BOINC が表示に使う言語を何にしますか?"
-#: clientgui/DlgOptions.cpp:189
+#: clientgui/DlgOptions.cpp:190
msgid "Notice reminder interval:"
msgstr "お知らせの通知間隔:"
-#: clientgui/DlgOptions.cpp:196
+#: clientgui/DlgOptions.cpp:197
msgid "How often should BOINC remind you of new notices?"
msgstr "どれくらいの間隔で BOINC はあなたに新しいお知らせを通知すべきですか？"
-#: clientgui/DlgOptions.cpp:201
+#: clientgui/DlgOptions.cpp:202
msgid "Run Manager at login?"
msgstr "マネージャをログオン時に起動しますか?"
-#: clientgui/DlgOptions.cpp:207
+#: clientgui/DlgOptions.cpp:208
msgid "Run the BOINC Manager when you log on."
msgstr "あなたがログオンしたときにBOINC マネージャを起動します。"
-#: clientgui/DlgOptions.cpp:212
+#: clientgui/DlgOptions.cpp:213
+msgid "Run daemon?"
+msgstr "バックグラウンドで実行?"
+
+#: clientgui/DlgOptions.cpp:219
+msgid "Run daemon when launching the Manager."
+msgstr "マネージャーの起動時には、バックグラウンド上で実行します。"
+
+#: clientgui/DlgOptions.cpp:223
msgid "Enable Manager exit dialog?"
msgstr "マネージャ終了時のダイアログを有効化しますか?"
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgOptions.cpp:229
msgid "Display the exit dialog when shutting down the Manager."
msgstr "このマネージャ・プログラムを停止させるときに終了ダイアログを表示します。"
-#: clientgui/DlgOptions.cpp:229
+#: clientgui/DlgOptions.cpp:240
msgid "Dial-up and Virtual Private Network settings"
msgstr "ダイヤルアップおよび仮想プライベートネットワークの設定"
-#: clientgui/DlgOptions.cpp:243
+#: clientgui/DlgOptions.cpp:254
msgid "&Set Default"
msgstr "初期値に設定(&S)"
-#: clientgui/DlgOptions.cpp:248
+#: clientgui/DlgOptions.cpp:259
msgid "&Clear Default"
msgstr "初期値をクリア(&C)"
-#: clientgui/DlgOptions.cpp:255
+#: clientgui/DlgOptions.cpp:266
msgid "Default Connection:"
msgstr "初期値での接続:"
-#: clientgui/DlgOptions.cpp:262
+#: clientgui/DlgOptions.cpp:273
msgid "Connections"
msgstr "接続"
-#: clientgui/DlgOptions.cpp:271
+#: clientgui/DlgOptions.cpp:282
msgid "Connect via HTTP proxy server"
msgstr "HTTP プロキシサーバ経由で接続する"
-#: clientgui/DlgOptions.cpp:275
+#: clientgui/DlgOptions.cpp:286
msgid "HTTP Proxy Server Configuration"
msgstr "HTTP プロキシサーバの設定"
-#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:294 clientgui/DlgOptions.cpp:358
msgid "Address:"
msgstr "アドレス:"
-#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:302 clientgui/DlgOptions.cpp:366
#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
msgid "Port:"
msgstr "ポート番号:"
-#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:310 clientgui/DlgOptions.cpp:374
msgid "Don't use proxy for:"
msgstr "プロキシを使わない対象:"
-#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
msgid "Leave these blank if not needed"
msgstr "プロキシを必要としない場合は空欄のままにしてください"
-#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:323 clientgui/DlgOptions.cpp:387
#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
msgid "User Name:"
msgstr "プロキシのユーザー名:"
-#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:331 clientgui/DlgOptions.cpp:395
#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
#: clientgui/ProxyPage.cpp:366
msgid "Password:"
msgstr "パスワード:"
-#: clientgui/DlgOptions.cpp:327
+#: clientgui/DlgOptions.cpp:338
msgid "HTTP Proxy"
msgstr "HTTP プロキシ"
-#: clientgui/DlgOptions.cpp:335
+#: clientgui/DlgOptions.cpp:346
msgid "Connect via SOCKS proxy server"
msgstr "SOCKS プロキシサーバ経由で接続する"
-#: clientgui/DlgOptions.cpp:339
+#: clientgui/DlgOptions.cpp:350
msgid "SOCKS Proxy Server Configuration"
msgstr "SOCKS プロキシサーバの設定"
-#: clientgui/DlgOptions.cpp:391
+#: clientgui/DlgOptions.cpp:402
msgid "SOCKS Proxy"
msgstr "SOCKS プロキシ"
-#: clientgui/DlgOptions.cpp:589
+#: clientgui/DlgOptions.cpp:600
msgid "always"
msgstr "常時通知"
-#: clientgui/DlgOptions.cpp:590
+#: clientgui/DlgOptions.cpp:601
msgid "1 hour"
msgstr "1時間"
-#: clientgui/DlgOptions.cpp:591
+#: clientgui/DlgOptions.cpp:602
msgid "6 hours"
msgstr "6時間"
-#: clientgui/DlgOptions.cpp:592
+#: clientgui/DlgOptions.cpp:603
msgid "1 day"
msgstr "1日"
-#: clientgui/DlgOptions.cpp:593
+#: clientgui/DlgOptions.cpp:604
msgid "1 week"
msgstr "1週間"
-#: clientgui/DlgOptions.cpp:594
+#: clientgui/DlgOptions.cpp:605
msgid "never"
msgstr "通知しない"
-#: clientgui/DlgOptions.cpp:691
+#: clientgui/DlgOptions.cpp:703
#, c-format
msgid "%s - Language Selection"
msgstr "%s - 言語の選択"
-#: clientgui/DlgOptions.cpp:698
+#: clientgui/DlgOptions.cpp:710
#, c-format
msgid ""
"The %s's language has been changed. In order for this change to take "
@@ -2372,7 +2393,7 @@ msgid "The home page of the GEO-600 project"
msgstr "GEO-600 プロジェクトのホームページ"
#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
-#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:441
+#: clientgui/ViewProjects.cpp:257 clientgui/ViewStatistics.cpp:441
msgid "Team"
msgstr "チーム"
@@ -2436,203 +2457,203 @@ msgstr "研究"
msgid "Learn about the projects hosted at World Community Grid"
msgstr "World Community Grid で運営されるプロジェクトについて知る"
-#: clientgui/MainDocument.cpp:583
+#: clientgui/MainDocument.cpp:584
msgid "Starting client"
msgstr "クライアントを起動中"
-#: clientgui/MainDocument.cpp:591
+#: clientgui/MainDocument.cpp:592
msgid "Connecting to client"
msgstr "クライアントに接続中"
-#: clientgui/MainDocument.cpp:1205
+#: clientgui/MainDocument.cpp:1206
msgid "Retrieving system state; please wait..."
msgstr "システムの状態を取得しています。お待ちください..."
-#: clientgui/MainDocument.cpp:1826
+#: clientgui/MainDocument.cpp:1827
msgid "Missing application"
msgstr "見つからないアプリケーション"
-#: clientgui/MainDocument.cpp:1827
+#: clientgui/MainDocument.cpp:1828
msgid ""
"Please download and install the CoRD application from "
"http://cord.sourceforge.net"
msgstr "http://cord.sourceforge.net から CoRD アプリケーションをダウンロードし、インストールしてください。"
-#: clientgui/MainDocument.cpp:2442
+#: clientgui/MainDocument.cpp:2443
msgid "on batteries"
msgstr "バッテリーで駆動中"
-#: clientgui/MainDocument.cpp:2443
+#: clientgui/MainDocument.cpp:2444
msgid "computer is in use"
msgstr "コンピュータを別途使用中"
-#: clientgui/MainDocument.cpp:2444
+#: clientgui/MainDocument.cpp:2445
msgid "user request"
msgstr "参加者の要求"
-#: clientgui/MainDocument.cpp:2445
+#: clientgui/MainDocument.cpp:2446
msgid "time of day"
msgstr "実行時間帯制約"
-#: clientgui/MainDocument.cpp:2446
+#: clientgui/MainDocument.cpp:2447
msgid "CPU benchmarks in progress"
msgstr "CPU ベンチマーク実行中"
-#: clientgui/MainDocument.cpp:2447
+#: clientgui/MainDocument.cpp:2448
msgid "need disk space - check preferences"
msgstr "ディスク容量の不足 - 好みの設定(プレファレンス)を確認してください"
-#: clientgui/MainDocument.cpp:2448
+#: clientgui/MainDocument.cpp:2449
msgid "computer is not in use"
msgstr "コンピュータ使用されていない"
-#: clientgui/MainDocument.cpp:2449
+#: clientgui/MainDocument.cpp:2450
msgid "starting up"
msgstr "起動の途中"
-#: clientgui/MainDocument.cpp:2450
+#: clientgui/MainDocument.cpp:2451
msgid "an exclusive app is running"
msgstr "排他的なアプリケーションを実行中"
-#: clientgui/MainDocument.cpp:2451
+#: clientgui/MainDocument.cpp:2452
msgid "CPU is busy"
msgstr "CPU を別途使用中"
-#: clientgui/MainDocument.cpp:2452
+#: clientgui/MainDocument.cpp:2453
msgid "network bandwidth limit exceeded"
msgstr "ネットワーク帯域幅の使用制約超過"
-#: clientgui/MainDocument.cpp:2453
+#: clientgui/MainDocument.cpp:2454
msgid "requested by operating system"
msgstr "オペレーティングシステムの指示による"
-#: clientgui/MainDocument.cpp:2455
+#: clientgui/MainDocument.cpp:2456
msgid "unknown reason"
msgstr "不明な理由"
-#: clientgui/MainDocument.cpp:2477
+#: clientgui/MainDocument.cpp:2478
msgid "GPU missing, "
msgstr "GPU が見当たりません、"
-#: clientgui/MainDocument.cpp:2484
+#: clientgui/MainDocument.cpp:2485
msgid "New"
msgstr "新規"
-#: clientgui/MainDocument.cpp:2488
+#: clientgui/MainDocument.cpp:2489
msgid "Download failed"
msgstr "ダウンロード失敗"
-#: clientgui/MainDocument.cpp:2490
+#: clientgui/MainDocument.cpp:2491
msgid "Downloading"
msgstr "ダウンロード中"
-#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
+#: clientgui/MainDocument.cpp:2493 clientgui/MainDocument.cpp:2552
msgid " (suspended - "
msgstr "(一時停止中 - "
-#: clientgui/MainDocument.cpp:2500
+#: clientgui/MainDocument.cpp:2501
msgid "Project suspended by user"
msgstr "参加者によってプロジェクト一時停止"
-#: clientgui/MainDocument.cpp:2502
+#: clientgui/MainDocument.cpp:2503
msgid "Task suspended by user"
msgstr "参加者によってタスク一時停止"
#. an NCI process can be running even though computation is suspended
#. (because of <dont_suspend_nci>
-#: clientgui/MainDocument.cpp:2507
+#: clientgui/MainDocument.cpp:2508
msgid "Suspended - "
msgstr "一時停止中 - "
-#: clientgui/MainDocument.cpp:2510
+#: clientgui/MainDocument.cpp:2511
msgid "GPU suspended - "
msgstr "GPUは一時停止中 -"
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2515
msgid "Waiting for memory"
msgstr "メモリ不足のため待機"
-#: clientgui/MainDocument.cpp:2516
+#: clientgui/MainDocument.cpp:2517
msgid "Waiting for shared memory"
msgstr "共有メモリが空くまで待機中"
-#: clientgui/MainDocument.cpp:2518
+#: clientgui/MainDocument.cpp:2519
msgid "Running"
msgstr "実行中"
-#: clientgui/MainDocument.cpp:2520
+#: clientgui/MainDocument.cpp:2521
msgid " (non-CPU-intensive)"
msgstr "(常時 CPU を使用するわけではありません)"
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2524
msgid "Waiting to run"
msgstr "実行待機"
-#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
+#: clientgui/MainDocument.cpp:2526 clientgui/MainDocument.cpp:2529
msgid "Ready to start"
msgstr "開始まで待機"
-#: clientgui/MainDocument.cpp:2532
+#: clientgui/MainDocument.cpp:2533
msgid "Postponed: "
msgstr "次まで延期:"
-#: clientgui/MainDocument.cpp:2535
+#: clientgui/MainDocument.cpp:2536
msgid "Postponed"
msgstr "延期"
-#: clientgui/MainDocument.cpp:2539
+#: clientgui/MainDocument.cpp:2540
msgid "Waiting for network access"
msgstr "ネットワーク接続の待機中"
-#: clientgui/MainDocument.cpp:2543
+#: clientgui/MainDocument.cpp:2544
msgid "Computation error"
msgstr "計算中に異常発生"
-#: clientgui/MainDocument.cpp:2547
+#: clientgui/MainDocument.cpp:2548
msgid "Upload failed"
msgstr "アップロード失敗"
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2550
msgid "Uploading"
msgstr "アップロード中"
-#: clientgui/MainDocument.cpp:2560
+#: clientgui/MainDocument.cpp:2561
msgid "Aborted by user"
msgstr "参加者によって中止"
-#: clientgui/MainDocument.cpp:2563
+#: clientgui/MainDocument.cpp:2564
msgid "Aborted by project"
msgstr "プロジェクトによって中止"
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2567
msgid "Aborted: not started by deadline"
msgstr "中止: 報告期限までに開始されませんでした"
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2570
msgid "Aborted: task disk limit exceeded"
msgstr "中止: タスクがディスクの利用可能領域を超過しました"
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2573
msgid "Aborted: run time limit exceeded"
msgstr "中止: 報告期限を超過しました"
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2576
msgid "Aborted: memory limit exceeded"
msgstr "中止: メモリの利用可能領域を超過しました"
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2579
msgid "Aborted"
msgstr "中止"
-#: clientgui/MainDocument.cpp:2583
+#: clientgui/MainDocument.cpp:2584
msgid "Acknowledged"
msgstr "サーバ承認済み"
-#: clientgui/MainDocument.cpp:2585
+#: clientgui/MainDocument.cpp:2586
msgid "Ready to report"
msgstr "報告待機"
-#: clientgui/MainDocument.cpp:2587
+#: clientgui/MainDocument.cpp:2588
#, c-format
msgid "Error: invalid state '%d'"
msgstr "エラー: 無効状態 '%d'"
@@ -2949,7 +2970,7 @@ msgid "'%s' does not contain a valid path."
msgstr "'%s' には有効なパスが含まれていません。 "
#. Setup View
-#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:200
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:202
#: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
#: clientgui/ViewWork.cpp:207
msgid "Commands"
@@ -3007,17 +3028,17 @@ msgstr "お知らせは現在ありません。"
msgid "Notices"
msgstr "お知らせ"
-#: clientgui/ViewProjects.cpp:204 clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewProjects.cpp:206 clientgui/sg_ProjectCommandPopup.cpp:66
msgid "Update"
msgstr "更新"
-#: clientgui/ViewProjects.cpp:205 clientgui/sg_ProjectCommandPopup.cpp:67
+#: clientgui/ViewProjects.cpp:207 clientgui/sg_ProjectCommandPopup.cpp:67
msgid ""
"Report all completed tasks, get latest credit, get latest preferences, and "
"possibly get more tasks."
msgstr "完了した全タスクを報告し、最新の功績 (credit) とプレファレンス (好みの設定) を取得し、可能であれば更にタスクを取得します。"
-#: clientgui/ViewProjects.cpp:211 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:213 clientgui/ViewProjects.cpp:812
#: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
#: clientgui/sg_BoincSimpleFrame.cpp:893
#: clientgui/sg_ProjectCommandPopup.cpp:72
@@ -3026,196 +3047,196 @@ msgstr "完了した全タスクを報告し、最新の功績 (credit) とプ
msgid "Suspend"
msgstr "一時停止"
-#: clientgui/ViewProjects.cpp:212 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:214 clientgui/ViewProjects.cpp:812
#: clientgui/sg_ProjectCommandPopup.cpp:73
#: clientgui/sg_ProjectCommandPopup.cpp:129
msgid "Suspend tasks for this project."
msgstr "このプロジェクトが実行しているタスクを一時的に停止します。"
-#: clientgui/ViewProjects.cpp:218 clientgui/ViewProjects.cpp:829
+#: clientgui/ViewProjects.cpp:220 clientgui/ViewProjects.cpp:831
#: clientgui/sg_ProjectCommandPopup.cpp:78
#: clientgui/sg_ProjectCommandPopup.cpp:136
msgid "No new tasks"
-msgstr "新しいタスクを取得しない"
+msgstr "新規タスクの取得禁止"
-#: clientgui/ViewProjects.cpp:219 clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:221 clientgui/sg_ProjectCommandPopup.cpp:79
msgid "Don't get new tasks for this project."
msgstr "このプロジェクトのタスクを新たに取得しないようにします。"
-#: clientgui/ViewProjects.cpp:225 clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:227 clientgui/sg_ProjectCommandPopup.cpp:84
msgid "Reset project"
msgstr "プロジェクトをリセット"
-#: clientgui/ViewProjects.cpp:226 clientgui/sg_ProjectCommandPopup.cpp:85
+#: clientgui/ViewProjects.cpp:228 clientgui/sg_ProjectCommandPopup.cpp:85
msgid ""
"Delete all files and tasks associated with this project, and get new tasks."
" You can update the project first to report any completed tasks."
msgstr "このプロジェクトに関係するすべてのファイルとタスクを削除し、新しいタスクを取得します。完了した仕事を報告するには、先にそのプロジェクトを更新してください。"
-#: clientgui/ViewProjects.cpp:233 clientgui/sg_ProjectCommandPopup.cpp:91
+#: clientgui/ViewProjects.cpp:235 clientgui/sg_ProjectCommandPopup.cpp:91
msgid ""
"Remove this project. Tasks in progress will be lost (use 'Update' first to "
"report any completed tasks)."
msgstr "このプロジェクトを削除します。進行中のタスクは消えてしまいます(完了したタスクを報告するため、削除する前にプロジェクトの「更新」を行ってください)。 "
-#: clientgui/ViewProjects.cpp:239 clientgui/ViewWork.cpp:246
+#: clientgui/ViewProjects.cpp:241 clientgui/ViewWork.cpp:246
#: clientgui/sg_ProjectCommandPopup.cpp:96
#: clientgui/sg_TaskCommandPopup.cpp:84
msgid "Properties"
msgstr "プロパティ"
-#: clientgui/ViewProjects.cpp:240 clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:242 clientgui/sg_ProjectCommandPopup.cpp:97
msgid "Show project details."
msgstr "プロジェクトの詳細を表示します。"
-#: clientgui/ViewProjects.cpp:254 clientgui/ViewStatistics.cpp:426
+#: clientgui/ViewProjects.cpp:256 clientgui/ViewStatistics.cpp:426
msgid "Account"
msgstr "アカウント"
-#: clientgui/ViewProjects.cpp:256
+#: clientgui/ViewProjects.cpp:258
msgid "Work done"
msgstr "終了した仕事量"
-#: clientgui/ViewProjects.cpp:257
+#: clientgui/ViewProjects.cpp:259
msgid "Avg. work done"
msgstr "終了した仕事量の平均"
-#: clientgui/ViewProjects.cpp:259 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewProjects.cpp:261 clientgui/ViewTransfers.cpp:215
#: clientgui/ViewWork.cpp:262
msgid "Status"
msgstr "状態"
-#: clientgui/ViewProjects.cpp:338
+#: clientgui/ViewProjects.cpp:340
msgid "Projects"
msgstr "プロジェクト"
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:392
msgid "Updating project..."
msgstr "プロジェクトを更新しています..."
-#: clientgui/ViewProjects.cpp:432
+#: clientgui/ViewProjects.cpp:434
msgid "Resuming project..."
msgstr "プロジェクトを再開させています..."
-#: clientgui/ViewProjects.cpp:436
+#: clientgui/ViewProjects.cpp:438
msgid "Suspending project..."
msgstr "プロジェクトを一時停止させています..."
-#: clientgui/ViewProjects.cpp:473
+#: clientgui/ViewProjects.cpp:475
msgid "Telling project to allow additional task downloads..."
msgstr "タスクをさらにダウンロードしてよいことをプロジェクトに伝えています..."
-#: clientgui/ViewProjects.cpp:477
+#: clientgui/ViewProjects.cpp:479
msgid "Telling project to not fetch any additional tasks..."
msgstr "タスクを余分に取得しないようにプロジェクトに伝えています..."
-#: clientgui/ViewProjects.cpp:513
+#: clientgui/ViewProjects.cpp:515
msgid "Resetting project..."
msgstr "プロジェクトをリセットしています..."
-#: clientgui/ViewProjects.cpp:526 clientgui/sg_ProjectCommandPopup.cpp:229
+#: clientgui/ViewProjects.cpp:528 clientgui/sg_ProjectCommandPopup.cpp:229
#, c-format
msgid "Are you sure you want to reset project '%s'?"
msgstr "本当にプロジェクト '%s' をリセットしてよろしいですか?"
-#: clientgui/ViewProjects.cpp:532 clientgui/sg_ProjectCommandPopup.cpp:235
+#: clientgui/ViewProjects.cpp:534 clientgui/sg_ProjectCommandPopup.cpp:235
msgid "Reset Project"
msgstr "プロジェクトをリセット"
-#: clientgui/ViewProjects.cpp:571
+#: clientgui/ViewProjects.cpp:573
msgid "Removing project..."
msgstr "プロジェクトを削除しています..."
-#: clientgui/ViewProjects.cpp:584 clientgui/sg_ProjectCommandPopup.cpp:266
+#: clientgui/ViewProjects.cpp:586 clientgui/sg_ProjectCommandPopup.cpp:266
#, c-format
msgid "Are you sure you want to remove project '%s'?"
msgstr "本当にプロジェクト '%s' を削除してよろしいですか?"
-#: clientgui/ViewProjects.cpp:590 clientgui/sg_ProjectCommandPopup.cpp:272
+#: clientgui/ViewProjects.cpp:592 clientgui/sg_ProjectCommandPopup.cpp:272
msgid "Remove Project"
msgstr "プロジェクトを削除"
-#: clientgui/ViewProjects.cpp:631 clientgui/ViewWork.cpp:686
+#: clientgui/ViewProjects.cpp:633 clientgui/ViewWork.cpp:686
msgid "Launching browser..."
msgstr "ブラウザを起動中..."
-#: clientgui/ViewProjects.cpp:806 clientgui/sg_ProjectCommandPopup.cpp:126
+#: clientgui/ViewProjects.cpp:808 clientgui/sg_ProjectCommandPopup.cpp:126
msgid "Resume tasks for this project."
msgstr "このプロジェクトのタスクを再開します"
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:133
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:133
msgid "Allow new tasks"
-msgstr "新しいタスクを許可"
+msgstr "新規タスクを許可"
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:134
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:134
msgid "Allow fetching new tasks for this project."
msgstr "このプロジェクトについて新しいタスクの取得を許可します。"
-#: clientgui/ViewProjects.cpp:829 clientgui/sg_ProjectCommandPopup.cpp:137
+#: clientgui/ViewProjects.cpp:831 clientgui/sg_ProjectCommandPopup.cpp:137
msgid "Don't fetch new tasks for this project."
msgstr "このプロジェクトについて新しいタスクの取得を禁止します。"
-#: clientgui/ViewProjects.cpp:1133
+#: clientgui/ViewProjects.cpp:1135
msgid "Requested by user"
msgstr "参加者の指示による"
-#: clientgui/ViewProjects.cpp:1134
+#: clientgui/ViewProjects.cpp:1136
msgid "To fetch work"
msgstr "仕事を取りに行く"
-#: clientgui/ViewProjects.cpp:1135
+#: clientgui/ViewProjects.cpp:1137
msgid "To report completed tasks"
msgstr "完了したタスクを報告する"
-#: clientgui/ViewProjects.cpp:1136
+#: clientgui/ViewProjects.cpp:1138
msgid "To send trickle-up message"
msgstr "トリクルアップ・メッセージを送信する"
-#: clientgui/ViewProjects.cpp:1137
+#: clientgui/ViewProjects.cpp:1139
msgid "Requested by account manager"
msgstr "アカウント・マネージャの指示による"
-#: clientgui/ViewProjects.cpp:1138
+#: clientgui/ViewProjects.cpp:1140
msgid "Project initialization"
msgstr "プロジェクトの初期化"
-#: clientgui/ViewProjects.cpp:1139
+#: clientgui/ViewProjects.cpp:1141
msgid "Requested by project"
msgstr "プロジェクトの指示による"
-#: clientgui/ViewProjects.cpp:1140
+#: clientgui/ViewProjects.cpp:1142
msgid "Unknown reason"
msgstr "理由不明"
-#: clientgui/ViewProjects.cpp:1154
+#: clientgui/ViewProjects.cpp:1156
msgid "Suspended by user"
msgstr "参加者により一時停止中"
-#: clientgui/ViewProjects.cpp:1157
+#: clientgui/ViewProjects.cpp:1159
msgid "Won't get new tasks"
-msgstr "新しいタスクを取得しない"
+msgstr "新規タスクの取得禁止"
-#: clientgui/ViewProjects.cpp:1160
+#: clientgui/ViewProjects.cpp:1162
msgid "Project ended - OK to remove"
msgstr "プロジェクトは終了しました - 削除するにはOKを押します。"
-#: clientgui/ViewProjects.cpp:1163
+#: clientgui/ViewProjects.cpp:1165
msgid "Will remove when tasks done"
msgstr "タスクが完了したら削除します"
-#: clientgui/ViewProjects.cpp:1166
+#: clientgui/ViewProjects.cpp:1168
msgid "Scheduler request pending"
msgstr "スケジューラへの要求を保留"
-#: clientgui/ViewProjects.cpp:1172
+#: clientgui/ViewProjects.cpp:1174
msgid "Scheduler request in progress"
msgstr "スケジューラへ要求中"
-#: clientgui/ViewProjects.cpp:1175
+#: clientgui/ViewProjects.cpp:1177
msgid "Trickle up message pending"
msgstr "トリクルアップ・メッセージの送信保留あり"
-#: clientgui/ViewProjects.cpp:1181
+#: clientgui/ViewProjects.cpp:1183
msgid "Communication deferred"
msgstr "延期された通信"
diff --git a/locale/pl/BOINC-Client.mo b/locale/pl/BOINC-Client.mo
index 2b25b3d..5ef81a4 100644
Binary files a/locale/pl/BOINC-Client.mo and b/locale/pl/BOINC-Client.mo differ
diff --git a/locale/pl/BOINC-Client.po b/locale/pl/BOINC-Client.po
index d8ea303..a00284b 100644
--- a/locale/pl/BOINC-Client.po
+++ b/locale/pl/BOINC-Client.po
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Simek <gosimek at gmail.com>, 2015
# Michal Jablonski <jablonski.michal at gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: BOINC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2015-06-28 19:30+0000\n"
-"Last-Translator: Rafał Kaźmierczak <prometh.dragu at gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/boinc/language/pl/)\n"
+"PO-Revision-Date: 2015-09-11 19:49+0000\n"
+"Last-Translator: Simek <gosimek at gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/boinc/boinc/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,7 @@ msgstr "Wiadomość z serwera"
msgid ""
"Some tasks need more memory than allowed by your preferences. Please check "
"the preferences."
-msgstr "Niektóre zadania wymagają więcej pamięci niż ustawiono w preferencjach. Sprawdź preferencje."
+msgstr "Niektóre zadania wymagają więcej pamięci niż ustawiono w preferencjach. Sprawdź swoje ustawienia."
#: client_state.cpp:520
msgid "Couldn't write state file; check directory permissions"
@@ -81,7 +82,7 @@ msgstr "Błąd ustawień w cc_config.xml"
#: log_flags.cpp:483
msgid "Missing end tag in cc_config.xml"
-msgstr "Brakujący znacznik końcowy w cc_config.xml"
+msgstr "Brakujący znacznik zamykający w cc_config.xml"
#: ../sched/handle_request.cpp:307
msgid "Invalid or missing account key. To fix, remove and add this project."
@@ -117,7 +118,7 @@ msgstr "Ten projekt nie wspiera komputerów typu"
#: ../sched/sched_send.cpp:1092
msgid ""
"Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr "Zaktualizuj sterowniki do najnowszych, aby użyć do obliczeń GPU"
+msgstr "Zaktualizuj sterowniki do najnowszej wersji, aby móc użyć GPU do obliczeń"
#: ../sched/sched_send.cpp:1099
msgid ""
@@ -137,7 +138,7 @@ msgstr "%s GPU jest wymagane do obliczeń w tym projekcie"
#: ../sched/sched_send.cpp:1262
msgid "No tasks are available for the applications you have selected."
-msgstr "Brak dostępnych zadań dla aplikacji które wybrałeś."
+msgstr "Brak dostępnych zadań dla wybranych aplikacji."
#: ../sched/sched_send.cpp:1288
msgid "Your computer type is not supported by this project"
diff --git a/locale/zh_CN/BOINC-Drupal.po b/locale/zh_CN/BOINC-Drupal.po
index ca8fe6e..1366084 100644
--- a/locale/zh_CN/BOINC-Drupal.po
+++ b/locale/zh_CN/BOINC-Drupal.po
@@ -8,237 +8,187 @@
msgid ""
msgstr ""
"Project-Id-Version: BOINC\n"
-"POT-Creation-Date: 2015-05-07 12:21+0000\n"
-"PO-Revision-Date: 2015-07-07 00:36+0000\n"
-"Last-Translator: 李泽林\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/boinc/language/zh_CN/)\n"
+"POT-Creation-Date: 2015-08-14 09:37+0000\n"
+"PO-Revision-Date: 2015-09-04 05:22+0000\n"
+"Last-Translator: 秦赫阳 <qysnn1 at gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/boinc/boinc/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-msgid ""
-"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
-" your e-mail address, it will be used for your user picture."
-msgstr "如果你有一个<a href=\"@gravatar-check\">正确的头像</a> 和你的电子邮件地址关联，它将被用作你的用户图片。"
-
-msgid "Your Gravatar will not be shown if you upload a user picture."
-msgstr "如果你上传了一张用户图片，则不会显示你的 Gravatar。"
-
-msgid ""
-"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
-" your e-mail address, use it for your user picture."
-msgstr "如果你有一个<a href=\"@gravatar-check\">正确的 Gravatar</a> 与你的电子邮件地址关联，它将被用作你的用户图片。"
-
-msgid "Gravatar will not be shown if an avatar is uploaded."
-msgstr "如果上传了头像，则不会显示 Gravatar。"
-
-msgid "This is not available until your profile is set up."
-msgstr "仅在你的档案创建后才可用。"
-
-msgid "Should @project show your computers on its web site?"
-msgstr "@project 是否应该在网站上显示你的计算机？"
-
-msgid "Click here to revoke your membership with @this_team"
-msgstr "点击这里来退出 @this_team"
-
-msgid "Minimum avg credit to post"
-msgstr "发帖要求的最低平均积分"
-
-msgid "Founder & Team Admins have moderator privileges"
-msgstr "创建人和团队管理员有仲裁的权利"
+msgid "No account exists for @email -- select \"Create new account\" to register"
+msgstr "名为 @email 的帐户不存在 —— 选择\"创建新帐户\"来注册"
-msgid "Notes about changes in foundership:"
-msgstr "创建人修改的注意事项："
+msgid "My team"
+msgstr "我的团队"
-msgid "Foundership can be requested by team members:"
-msgstr "团队成员可以主动请求成为创建人"
+msgid "You are a member of @team."
+msgstr "你是 @team 的成员。"
-msgid "One request is allowed at a time"
-msgstr "一次只能处理一个请求"
+msgid "View my team"
+msgstr "查看我的团队"
-msgid "Any active request must be older than 90 days"
-msgstr "请求的有效期至少是 90 天"
-
-msgid "Current founder has 60 days to respond to a request"
-msgstr "当前的创建人有 60 天的时间来处理一个请求"
+msgid "Invalid setting for \"%preference\""
+msgstr "\"%偏好\"设置无效"
msgid ""
-"If a team admin quits the team, they cease to be a team admin. We recommend "
-"only selecting people you know and trust"
-msgstr "如果团队管理员退出团队，他将不再是团队管理员。我们建议只选择你认识并信任的人。"
+"You must earn @count more credits to be able to post comments on this site."
+msgstr "你还需要得到 @count 积分才能在这个网站上发表评论。"
-msgid "You may create a message board for use by @team"
-msgstr "你可以为 @team 团队创建一个留言板"
-
-msgid "parent removed"
-msgstr "parent 已移除"
-
-msgid "Maximum daily WU quota per CPU"
-msgstr "单 CPU 每日 WU 限额"
+msgid "Moderation"
+msgstr "编辑"
-msgid "Received time"
-msgstr "接收时间"
+msgid "Unvetted profiles"
+msgstr "已验证的用户档案"
-msgid "App ID"
-msgstr "应用 ID"
+msgid "Reason for banning this user"
+msgstr "封禁此用户的理由"
-msgid "Error mask"
-msgstr "错误掩码"
+msgid ""
+"This reason will be included in an email to the user. Please write a brief "
+"explanation of why the user is being banned."
+msgstr "这个原因将列入给用户的电子邮件。请写一个简短解释为什么用户被禁止。"
-msgid "Minimum quorum"
-msgstr "最小配额"
+msgid "Duration of the ban"
+msgstr "这项禁令的持续时间"
-msgid "Max error tasks"
-msgstr "最大的错误任务"
+msgid "The number of days until the ban expires. Set to 0 to ban permanently."
+msgstr "这项禁令有效期的天数。设置为 0，永久禁止。"
-msgid "Max success tasks"
-msgstr "最大的成功任务"
+msgid "Lift user ban"
+msgstr "取消用户禁令"
-msgid "Max total tasks"
-msgstr "最大的总任务"
+msgid "You are banned from community participation until @date"
+msgstr "你被禁止参与社区直到 @date"
-msgid "Target number of results"
-msgstr "结果的目标数量"
+msgid "Computers @old_ids have been merged successfully into @id."
+msgstr "计算机 @old_id 已被成功合并到 @id。"
-msgid "Application version ID"
-msgstr "应用版本 ID"
+msgid "A team named \"@name\" already exists."
+msgstr "名为\"@name\"的团队已经存在。"
-msgid "Plan class"
-msgstr "计划类别"
+msgid "Post topic"
+msgstr "发表主题"
-msgid "Version number"
-msgstr "版本号"
+msgid "Please enter your email address"
+msgstr "请输入您的电子邮箱地址"
-msgid "App version ID"
-msgstr "应用版本 ID"
+msgid "Password entered is not valid. Please verify that it is correct."
+msgstr "输入的密码是无效的。请验证它的正确性。"
-msgid "@count million ops/sec"
-msgstr "@count 百万操作/秒"
+msgid "Make founder"
+msgstr "指定创始人"
-msgid "@rate KiB/sec"
-msgstr "@rate 千字节/秒"
+msgid "!site: comment posted to \"!topic_name\""
+msgstr "!site: 对帖子 \"!topic_name\" 发表了评论"
-msgid "@count days"
-msgstr "@count 天"
+msgid "!author has posted a reply to \"!topic_name\"."
+msgstr "!author 回复了帖子 \"!topic_name\"."
-msgid "@ip_address (same the last @count times)"
-msgstr "@ip_address（最近 @count 次）"
+msgid ""
+"To view this topic at !site, click here: \n"
+"!comment_url"
+msgstr "若要在本主题查看 !site，请单击此处:\n!comment_url"
-msgid "commented on"
-msgstr "评论时间"
+msgid "At least one application must be selected"
+msgstr "必须选择至少一个应用程序"
-msgid "Remove sticky status from this topic"
-msgstr "去除此主题的置顶状态"
+msgid "Forgot password"
+msgstr "忘记密码"
msgid ""
-"Check the computers that are the same as @name (created on @date at @time "
-"with computer ID @id)"
-msgstr "检查和 @name 同名的计算机（计算机 ID %id，创建日期及时间 @date @time）"
+"Enter your email address to receive instructions for resetting your "
+"password."
+msgstr "输入您的电子邮件地址来接收关于重置密码的指示。"
-msgid "Computer @old_id has been merged successfully into @id."
-msgstr "计算机 @old_id 已被成功合并到 @id。"
+msgid "Revise or post comment"
+msgstr "修改或发表评论"
-msgid "started discussion"
-msgstr "已开始的讨论"
+msgid "discuss"
+msgstr "讨论"
-msgid "posted"
-msgstr "已发表"
+msgid "Your community preferences have been updated."
+msgstr "已更新您的社区参数设置。"
-msgid "Minimum value not met for @field"
-msgstr "@field 未达到最小值"
+msgid "Unlock this thread for comments"
+msgstr "解锁此主题的评论"
-msgid "Invalid data type for @field"
-msgstr "@field 非法数据类型"
+msgid "Authenticator login"
+msgstr "验证器登录"
-msgid ""
-"Authentication is required when changing E-mail address or setting new "
-"password."
-msgstr "更改电子邮件地址或密码时，需要验证身份。"
+msgid "Create content"
+msgstr "创建内容"
-msgid "Request foundership"
-msgstr "请求创建人资格"
+msgid "authenticator-based login"
+msgstr "基于身份验证器登录"
msgid ""
-"If the team founder is not active and you want to assume the role of "
-"founder, click below to request foundership of @this_team."
-msgstr "在团队创始人处于不活跃状态的情况下，如果您想要代替其成为创始人，请点击下面以申请成为 @this_team 的创始人。"
-
-msgid "Initiate request"
-msgstr "发起请求"
-
-msgid "A BOINC account already exists for @email."
-msgstr "@email名下已经注册了一个BOINC账户，请尝试登录。"
+"Enter your email address to receive instructions for resetting your password"
+" (or use the !authenticator_login)."
+msgstr "输入您的电子邮件地址用于收到重置密码的指示 (或使用 !authenticator_login)。"
msgid ""
-"Please be responsible in what you write and do not create posts which are "
-"offensive or insulting. Offensive posts or threads may be deleted by forum "
-"moderators without warning or discussion. Do not respond to offensive "
-"postings. Click on the \"report\" button at the bottom of the post to call "
-"it to the attention of the moderators."
-msgstr "请对你所写的内容负责，不要发表含有攻击性或侮辱性的帖子。论坛版主可以不经警告或讨论而直接删除不恰当的帖子或主题。不要在无礼的帖子上浪费时间，请直接单击底部的\"报告\"按钮向版主报告这个帖子。"
-
-msgid "this project"
-msgstr "此项目"
+"If you forgot your account's email address, or you can't receive email "
+"there:"
+msgstr "如果你已经忘记了你账户所关联的电子邮箱地址，或者你已经不能从该地址接收电子邮件："
msgid ""
-"We also ask that you keep all discussion on the message boards related to "
-"@project or BOINC with the small exception of the Science message board "
-"where you are free to discuss anything relevant to the underlying science. "
-"Participants interested in broader discussions should post to unofficial "
-"forums for @project."
-msgstr "我们也要求你保证留言板上的所有讨论均在@project 或 BOINC的范围内。除了一个小小的例外，科学留言板，你可以在那里自由讨论任何有关的基本科学问题。更广泛的讨论应该发表到 @project 的非正式论坛。"
-
-msgid "These message boards now support BBCode tags only."
-msgstr "这些留言板目前仅支持BBCode标记。"
-
-msgid "Posts contributed"
-msgstr "发表的帖子"
-
-msgid "Profile awaiting moderator approval"
-msgstr "待审核的个人资料"
-
-msgid "Approve profile"
-msgstr "批准个人资料"
+"If you have run BOINC under the account, you can still access it. Here's "
+"how:"
+msgstr "如果您已经在帐户下运行 BOINC，您仍然可以访问它。这里是方法:"
-msgid "Approve this profile content"
-msgstr "批准此个人资料内容"
+msgid ""
+"Go to the BOINC data directory on your computer (on Windows this is usually "
+"%path1 or %path2."
+msgstr "打开你计算机上的 BOINC 数据路径 (在 Windows 上这通常是 %path1 或 %path2。"
-msgid "Edit profile"
-msgstr "编辑个人资料"
+msgid ""
+"Find your account file for this project; it will have a name like %file "
+"(where the project URL is %url)."
+msgstr "找到本项目的账户文件;文件名像 %文件 (如项目 URL 是 %url)。"
-msgid "Edit the content of this profile"
-msgstr "编辑此个人资料的内容"
+msgid ""
+"Open the file in a text editor like Notepad. You'll see something like:"
+msgstr "用记事本等文本编辑器打开该文件，你将看到类似的如下内容："
-msgid "Remove profile"
-msgstr "删除个人资料"
+msgid ""
+"Select and Copy the string between <authenticator> and "
+"</authenticator> (%auth in the above example)."
+msgstr "选中并复制< authenticator> 和 <之间的字符串;/authenticator> (上述例子中就应该是%auth )。"
-msgid "Remove this profile content from the system"
-msgstr "从系统中删除此个人资料的内容"
+msgid "There is no account with that authenticator."
+msgstr "没有账户关联至ga身份验证器。"
-msgid "The team founder has @count days to respond to your transfer request."
-msgstr "团队创始人有 @count 天来回应您的转让申请。"
+msgid ""
+"Go to the <a href=\"%wikiref\">BOINC data directory</a> on your computer (on"
+" Windows this is usually %path1 or %path2."
+msgstr "打开你计算机上的<a href=\"%wikiref\">BOINC 数据路径</a>(在 Windows 上这通常是 %path1 或 %path2。"
-msgid "Reject profile"
-msgstr "拒绝个人资料"
+msgid "BOINC documentation"
+msgstr "BOINC 文档"
-msgid "Reject this profile content"
-msgstr "拒绝此个人资料内容"
+msgid ""
+"Go to the BOINC data directory on your computer (see !boinc_wiki for help "
+"finding this)."
+msgstr "打开你计算机上的 BOINC 数据文件夹(请参见!boinc_wiki来帮助您找到这个文件夹)。"
-msgid "Reason for rejecting this profile"
-msgstr "拒绝此个人资料的原因"
+msgid ""
+"@count days have elapsed since your request and the founder has not "
+"responded."
+msgstr "创始人已经有@count 天没有响应您的请求。"
msgid ""
-"This reason will be included in an email to the user. Please write a brief "
-"explanation of the problem and how to fix it."
-msgstr "这个原因将附在给用户的电子邮件里。请简要说明存在的问题以及解决它的方法。"
+"You now have @count days to assume foundership before another team member "
+"may submit a request."
+msgstr "你现在需要在 @count 天内确认创始人资格，否则另一个团队成员就可以申请成为创始人。"
-msgid "Submit"
-msgstr "提交"
+msgid "Unhide this comment"
+msgstr "取消隐藏此回复"
-msgid "project"
-msgstr "项目"
+msgid "@email is not a well formed email address, please verify"
+msgstr "@email 不是一个正确格式的电子邮件地址，请验证"
msgid "Email address"
msgstr "电子邮件地址"
@@ -937,9 +887,28 @@ msgid ""
"presentation."
msgstr "该账户用于电子邮件的缺省语言和站点内容呈现的首选语言"
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, it will be used for your user picture."
+msgstr "如果你有一个<a href=\"@gravatar-check\">正确的头像</a> 和你的电子邮件地址关联，它将被用作你的用户图片。"
+
+msgid "Your Gravatar will not be shown if you upload a user picture."
+msgstr "如果你上传了一张用户图片，则不会显示你的头像。"
+
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, use it for your user picture."
+msgstr "如果你有一个<a href=\"@gravatar-check\">正确的头像</a> 与你的电子邮件地址关联，它将被用作你的用户图片。"
+
+msgid "Gravatar will not be shown if an avatar is uploaded."
+msgstr "如果上传了头像，则不会显示。"
+
msgid "Avatar settings"
msgstr "头像设定"
+msgid "This is not available until your profile is set up."
+msgstr "仅在你的档案创建后才可用。"
+
msgid "Create a profile"
msgstr "创建一个用户档案"
@@ -979,6 +948,9 @@ msgstr "隐私设定"
msgid "Is it OK for @project and your team (if any) to email you?"
msgstr "是否允许 @project 和你所在的团队（如果有的话）给你发送邮件？"
+msgid "Should @project show your computers on its web site?"
+msgstr "@project 是否应该在网站上显示你的计算机？"
+
msgid "Hide"
msgstr "隐藏"
@@ -1072,6 +1044,9 @@ msgstr "进入论坛"
msgid "Leave team"
msgstr "离开团队"
+msgid "Click here to revoke your membership with @this_team"
+msgstr "点击这里来退出 @this_team"
+
msgid "Leave this team"
msgstr "离开该团队"
@@ -1093,6 +1068,9 @@ msgstr "秒"
msgid "Minimum total credit to post"
msgstr "发贴要求的最低总积分"
+msgid "Minimum avg credit to post"
+msgstr "发帖要求的最低平均积分"
+
msgid "Allow public to read board?"
msgstr "是否允许公众访问该留言板？"
@@ -1111,18 +1089,36 @@ msgstr "只有团队成员可以发贴"
msgid "Only members may read (optional)"
msgstr "只有团队成员可以阅读（可选）"
+msgid "Founder & Team Admins have moderator privileges"
+msgstr "创建人和团队管理员有仲裁的权利"
+
msgid "Changing the team founder"
msgstr "改变团队创建人"
+msgid "Notes about changes in foundership:"
+msgstr "创建人修改的注意事项："
+
msgid "Any member of the team is eligible"
msgstr "每个团队成员都可以成为创建人"
msgid "Current founder becomes a normal user"
msgstr "当前创建人将变成普通用户"
+msgid "Foundership can be requested by team members:"
+msgstr "团队成员可以主动请求成为创建人"
+
+msgid "One request is allowed at a time"
+msgstr "一次只能处理一个请求"
+
msgid "It must be 60 days since any previous request"
msgstr "请求的间隔至少是 60 天"
+msgid "Any active request must be older than 90 days"
+msgstr "请求的有效期至少是 90 天"
+
+msgid "Current founder has 60 days to respond to a request"
+msgstr "当前的创建人有 60 天的时间来处理一个请求"
+
msgid "Add team admin"
msgstr "增加团队管理员"
@@ -1162,6 +1158,11 @@ msgstr "改变团队创建人"
msgid "Add / Remove team admins"
msgstr "增加或移除团队管理员"
+msgid ""
+"If a team admin quits the team, they cease to be a team admin. We recommend "
+"only selecting people you know and trust"
+msgstr "如果团队管理员退出团队，他将不再是团队管理员。我们建议只选择你认识并信任的人。"
+
msgid "Choose type"
msgstr "选择类型"
@@ -1204,6 +1205,9 @@ msgstr "创建团队留言板"
msgid "Create message board"
msgstr "创建留言板"
+msgid "You may create a message board for use by @team"
+msgstr "你可以为 @team 团队创建一个留言板"
+
msgid ""
"Please set the minimum average credit that a user is required to have in "
"order to post to this message board."
@@ -1218,6 +1222,9 @@ msgstr "匿名"
msgid "Unpublished"
msgstr "未发表"
+msgid "parent removed"
+msgstr "parent 已移除"
+
msgid "Sorry, unrecognized email address or password."
msgstr "对不起，无法识别的邮件地址或登录密码。"
@@ -1329,6 +1336,9 @@ msgstr "内存（RAM）"
msgid "Swap space"
msgstr "交换空间"
+msgid "Maximum daily WU quota per CPU"
+msgstr "单 CPU 每日 WU 限额"
+
msgid "Average download rate"
msgstr "平均下载速度"
@@ -1413,6 +1423,9 @@ msgstr "授予的积分"
msgid "Outcome"
msgstr "结果"
+msgid "Received time"
+msgstr "接收时间"
+
msgid "Report deadline"
msgstr "上报期限"
@@ -1428,6 +1441,9 @@ msgstr "标准错误输出"
msgid "Validation state"
msgstr "验证状态"
+msgid "App ID"
+msgstr "应用 ID"
+
msgid "Canonical credit"
msgstr "规范积分"
@@ -1437,15 +1453,45 @@ msgstr "规范结果 ID"
msgid "Created time"
msgstr "创建时间"
+msgid "Error mask"
+msgstr "错误掩码"
+
+msgid "Minimum quorum"
+msgstr "最小配额"
+
+msgid "Max error tasks"
+msgstr "最大的错误任务"
+
+msgid "Max success tasks"
+msgstr "最大的成功任务"
+
+msgid "Max total tasks"
+msgstr "最大的总任务"
+
msgid "Needs validation"
msgstr "需要验证"
msgid "Initial replication"
msgstr "初始任务拷贝"
+msgid "Target number of results"
+msgstr "结果的目标数量"
+
+msgid "Application version ID"
+msgstr "应用版本 ID"
+
+msgid "Plan class"
+msgstr "计划类别"
+
+msgid "Version number"
+msgstr "版本号"
+
msgid "Computer"
msgstr "计算机"
+msgid "App version ID"
+msgstr "应用版本 ID"
+
msgid "Consecutive valid tasks"
msgstr "连续成功完成的计算任务数目"
@@ -1464,6 +1510,15 @@ msgstr "显示 IP 地址"
msgid "hours"
msgstr "时"
+msgid "@count million ops/sec"
+msgstr "@count 百万操作/秒"
+
+msgid "@rate KiB/sec"
+msgstr "@rate 千字节/秒"
+
+msgid "@count days"
+msgstr "@count 天"
+
msgid "Remove friend"
msgstr "移除朋友"
@@ -1506,16 +1561,174 @@ msgstr "将此回复转移成一个新主题"
msgid "Details"
msgstr "详细"
+msgid "@ip_address (same the last @count times)"
+msgstr "@ip_address（最近 @count 次）"
+
+msgid "commented on"
+msgstr "评论时间"
+
msgid "Make unsticky"
msgstr "取消置顶"
+msgid "Remove sticky status from this topic"
+msgstr "去除此主题的置顶状态"
+
msgid ""
"Sometimes BOINC assigns separate identities to the same computer by mistake."
" You can correct this by merging old identities with the newest one."
msgstr "有时候，BOINC 会给同一台计算机赋予多个唯一标识，你可以通过将旧标识和新标识合并以纠正该问题。"
+msgid ""
+"Check the computers that are the same as @name (created on @date at @time "
+"with computer ID @id)"
+msgstr "检查和 @name 同名的计算机（计算机 ID %id，创建日期及时间 @date @time）"
+
+msgid "Computer @old_id has been merged successfully into @id."
+msgstr "计算机 @old_id 已被成功合并到 @id。"
+
+msgid "started discussion"
+msgstr "已开始的讨论"
+
+msgid "posted"
+msgstr "已发表"
+
+msgid "Minimum value not met for @field"
+msgstr "@field 未达到最小值"
+
msgid "Remove"
msgstr "删除"
msgid "hidden"
msgstr "隐藏"
+
+msgid "Invalid data type for @field"
+msgstr "@field 非法数据类型"
+
+msgid ""
+"Authentication is required when changing E-mail address or setting new "
+"password."
+msgstr "更改电子邮件地址或密码时，需要验证身份。"
+
+msgid "Request foundership"
+msgstr "请求创建人资格"
+
+msgid ""
+"If the team founder is not active and you want to assume the role of "
+"founder, click below to request foundership of @this_team."
+msgstr "在团队创始人处于不活跃状态的情况下，如果您想要代替其成为创始人，请点击下面以申请成为 @this_team 的创始人。"
+
+msgid "Initiate request"
+msgstr "发起请求"
+
+msgid "A BOINC account already exists for @email."
+msgstr "@email名下已经注册了一个BOINC账户，请尝试登录。"
+
+msgid ""
+"Please be responsible in what you write and do not create posts which are "
+"offensive or insulting. Offensive posts or threads may be deleted by forum "
+"moderators without warning or discussion. Do not respond to offensive "
+"postings. Click on the \"report\" button at the bottom of the post to call "
+"it to the attention of the moderators."
+msgstr "请对你所写的内容负责，不要发表含有攻击性或侮辱性的帖子。论坛版主可以不经警告或讨论而直接删除不恰当的帖子或主题。不要在无礼的帖子上浪费时间，请直接单击底部的\"报告\"按钮向版主报告这个帖子。"
+
+msgid "this project"
+msgstr "此项目"
+
+msgid ""
+"We also ask that you keep all discussion on the message boards related to "
+"@project or BOINC with the small exception of the Science message board "
+"where you are free to discuss anything relevant to the underlying science. "
+"Participants interested in broader discussions should post to unofficial "
+"forums for @project."
+msgstr "我们也要求你保证留言板上的所有讨论均在@project 或 BOINC的范围内。除了一个小小的例外，科学留言板，你可以在那里自由讨论任何有关的基本科学问题。更广泛的讨论应该发表到 @project 的非正式论坛。"
+
+msgid "These message boards now support BBCode tags only."
+msgstr "这些留言板目前仅支持BBCode标记。"
+
+msgid "Posts contributed"
+msgstr "发表的帖子"
+
+msgid "Profile awaiting moderator approval"
+msgstr "待审核的个人资料"
+
+msgid "Approve profile"
+msgstr "批准个人资料"
+
+msgid "Approve this profile content"
+msgstr "批准此个人资料内容"
+
+msgid "Edit profile"
+msgstr "编辑个人资料"
+
+msgid "Edit the content of this profile"
+msgstr "编辑此个人资料的内容"
+
+msgid "Remove profile"
+msgstr "删除个人资料"
+
+msgid "Remove this profile content from the system"
+msgstr "从系统中删除此个人资料的内容"
+
+msgid "The team founder has @count days to respond to your transfer request."
+msgstr "团队创始人有 @count 天来回应您的转让申请。"
+
+msgid "Reject profile"
+msgstr "拒绝个人资料"
+
+msgid "Reject this profile content"
+msgstr "拒绝此个人资料内容"
+
+msgid "Reason for rejecting this profile"
+msgstr "拒绝此个人资料的原因"
+
+msgid ""
+"This reason will be included in an email to the user. Please write a brief "
+"explanation of the problem and how to fix it."
+msgstr "这个原因将附在给用户的电子邮件里。请简要说明存在的问题以及解决它的方法。"
+
+msgid "Submit"
+msgstr "提交"
+
+msgid "project"
+msgstr "项目"
+
+msgid "Unknown"
+msgstr "未知"
+
+msgid "Pending"
+msgstr "等待中"
+
+msgid "User of the day"
+msgstr "今日用户"
+
+msgid "Account"
+msgstr "帐户"
+
+msgid "Log in"
+msgstr "登录"
+
+msgid "Send"
+msgstr "发送"
+
+msgid "News"
+msgstr "新闻"
+
+msgid "Unlock"
+msgstr "解锁"
+
+msgid "Paste the string into the field below, and click OK."
+msgstr "将之前复制的内容粘贴到下面的表单中，并点击确定。"
+
+msgid ""
+"You will now be logged in to your account; update the email and password of "
+"your account."
+msgstr "你现在将登录进自己的账户，可以更新你的电子邮箱地址和账户口令。"
+
+msgid "Log in with authenticator"
+msgstr "用身份验证码（authenticator）来登录"
+
+msgid "Assume foundership"
+msgstr "得到创建人资格"
+
+msgid "Unhide"
+msgstr "取消隐藏"
diff --git a/locale/zh_CN/BOINC-Manager.mo b/locale/zh_CN/BOINC-Manager.mo
index 48d7c71..7fcfc75 100644
Binary files a/locale/zh_CN/BOINC-Manager.mo and b/locale/zh_CN/BOINC-Manager.mo differ
diff --git a/locale/zh_CN/BOINC-Manager.po b/locale/zh_CN/BOINC-Manager.po
index 10ef178..8836fed 100644
--- a/locale/zh_CN/BOINC-Manager.po
+++ b/locale/zh_CN/BOINC-Manager.po
@@ -12,10 +12,10 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-23 18:52-0500\n"
-"PO-Revision-Date: 2015-07-24 03:08+0000\n"
-"Last-Translator: 李泽林\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/boinc/language/zh_CN/)\n"
+"POT-Creation-Date: 2015-08-24 17:05-0500\n"
+"PO-Revision-Date: 2015-09-04 05:26+0000\n"
+"Last-Translator: 秦赫阳 <qysnn1 at gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/boinc/boinc/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -741,12 +741,12 @@ msgstr "%s 当前未连接至任何 %s 客户端。\n请使用菜单中的'高
msgid "Project web pages"
msgstr "项目网页"
-#: clientgui/BOINCClientManager.cpp:573
+#: clientgui/BOINCClientManager.cpp:545
#, c-format
msgid "%s - Unexpected Exit"
msgstr "%s - 异常退出"
-#: clientgui/BOINCClientManager.cpp:583
+#: clientgui/BOINCClientManager.cpp:555
#, c-format
msgid ""
"The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -797,7 +797,7 @@ msgstr "%s 已经成功地断开至互联网的连接。"
msgid "%s failed to disconnected from the Internet."
msgstr "%s 断开至互联网的连接失败。"
-#: clientgui/BOINCGUIApp.cpp:351
+#: clientgui/BOINCGUIApp.cpp:356
#, c-format
msgid ""
"You currently are not authorized to manage the client.\n"
@@ -810,90 +810,94 @@ msgid ""
" user group."
msgstr "您当前未被授权管理本客户端。\n\n要在当前用户下运行 %s，请：\n - 重新安装 %s，在被问到关于非系统管理员用户的问题时，回答\"是\"\n - 联系系统管理员将您加入到“boinc_master”用户组。"
-#: clientgui/BOINCGUIApp.cpp:357
+#: clientgui/BOINCGUIApp.cpp:362
#, c-format
msgid ""
"%s ownership or permissions are not set properly; please reinstall %s.\n"
"(Error code %d"
msgstr "%s 相关的本地用户权限设置有误，请重新安装 %s。\n( 错误代码 %d )"
-#: clientgui/BOINCGUIApp.cpp:363
+#: clientgui/BOINCGUIApp.cpp:368
msgid " at "
msgstr " 位置 "
-#: clientgui/BOINCGUIApp.cpp:366 clientgui/MainDocument.cpp:2494
-#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
+#: clientgui/BOINCGUIApp.cpp:371 clientgui/MainDocument.cpp:2495
+#: clientgui/MainDocument.cpp:2554 clientgui/ViewTransfers.cpp:887
msgid ")"
msgstr ")"
-#: clientgui/BOINCGUIApp.cpp:396
+#: clientgui/BOINCGUIApp.cpp:401
msgid ""
"A reboot is required in order for BOINC to run properly.\n"
"Please reboot your computer and try again."
msgstr "BOINC 需要在计算机重新启动后才能正常运行。\n请您先重启计算机再重试当前的操作。"
-#: clientgui/BOINCGUIApp.cpp:397 clientgui/DlgAbout.cpp:153
+#: clientgui/BOINCGUIApp.cpp:402 clientgui/DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "BOINC Manager"
-#: clientgui/BOINCGUIApp.cpp:658
+#: clientgui/BOINCGUIApp.cpp:664
msgid "BOINC Manager was started by the operating system automatically"
msgstr "BOINC Manager 已经由操作系统自动运行"
-#: clientgui/BOINCGUIApp.cpp:660
+#: clientgui/BOINCGUIApp.cpp:666
msgid "Startup BOINC so only the system tray icon is visible"
msgstr "启动 BOINC 时仅显示在系统托盘区"
-#: clientgui/BOINCGUIApp.cpp:662
+#: clientgui/BOINCGUIApp.cpp:668
msgid "Directory containing the BOINC Client executable"
msgstr "包含 BOINC 客户端执行程序的目录"
-#: clientgui/BOINCGUIApp.cpp:663
+#: clientgui/BOINCGUIApp.cpp:669
msgid "BOINC data directory"
msgstr "BOINC 数据目录"
-#: clientgui/BOINCGUIApp.cpp:665
+#: clientgui/BOINCGUIApp.cpp:671
msgid "Host name or IP address"
msgstr "主机名称或 IP 地址"
-#: clientgui/BOINCGUIApp.cpp:666
+#: clientgui/BOINCGUIApp.cpp:672
msgid "GUI RPC port number"
msgstr "图形界面 RPC 端口号"
-#: clientgui/BOINCGUIApp.cpp:667
+#: clientgui/BOINCGUIApp.cpp:673
msgid "Password"
msgstr "用户口令"
-#: clientgui/BOINCGUIApp.cpp:668
+#: clientgui/BOINCGUIApp.cpp:674
msgid "Startup BOINC with these optional arguments"
msgstr "使用可选参数来启动 BOINC"
-#: clientgui/BOINCGUIApp.cpp:669
+#: clientgui/BOINCGUIApp.cpp:675
msgid "disable BOINC security users and permissions"
msgstr "禁用 BOINC 中用户和权限相关的安全选项"
-#: clientgui/BOINCGUIApp.cpp:670
+#: clientgui/BOINCGUIApp.cpp:676
msgid "set skin debugging mode to enable skin manager error messages"
msgstr "设置皮肤调试模式已启用皮肤管理器的错误消息记录"
-#: clientgui/BOINCGUIApp.cpp:671
+#: clientgui/BOINCGUIApp.cpp:677
msgid "multiple instances of BOINC Manager allowed"
msgstr "允许运行多个 BOINC Manager 的实例"
-#: clientgui/BOINCGUIApp.cpp:673
+#: clientgui/BOINCGUIApp.cpp:679
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "未使用：用于临时修复 XCode 4.2 的错误"
+#: clientgui/BOINCGUIApp.cpp:681
+msgid "Not run the daemon"
+msgstr "不运行守护进程"
+
#. These are just special tags so deal with them in a special way
-#: clientgui/BOINCGUIApp.cpp:920
+#: clientgui/BOINCGUIApp.cpp:931
msgid "(Automatic Detection)"
msgstr "( 自动检测 )"
-#: clientgui/BOINCGUIApp.cpp:921
+#: clientgui/BOINCGUIApp.cpp:932
msgid "(Unknown)"
msgstr "( 未知 )"
-#: clientgui/BOINCGUIApp.cpp:922
+#: clientgui/BOINCGUIApp.cpp:933
msgid "(User Defined)"
msgstr "( 用户自定义 )"
@@ -921,7 +925,7 @@ msgstr "让 GPU 休息一下"
msgid "E&xit"
msgstr "退出(&X)"
-#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:806
+#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:808
#: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
#: clientgui/sg_ProjectCommandPopup.cpp:125
#: clientgui/sg_TaskCommandPopup.cpp:118
@@ -1079,7 +1083,7 @@ msgid "For more information, visit "
msgstr "要获取更多信息，请访问"
#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:410
#: clientgui/DlgSelectComputer.cpp:163
msgid "&OK"
msgstr "确定(&O)"
@@ -1104,19 +1108,23 @@ msgstr "必须是0到10之间的数字"
msgid "Number must be between 0 and 100"
msgstr "数字必须介于 0 和 100 之间"
-#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:847
+#: clientgui/DlgAdvPreferences.cpp:689
+msgid "Number must be between 1 and 100"
+msgstr "数字必须介于 1 和 100 之间"
+
+#: clientgui/DlgAdvPreferences.cpp:947 clientgui/sg_DlgPreferences.cpp:847
msgid "invalid input value detected"
msgstr "检测到错误的输入值"
-#: clientgui/DlgAdvPreferences.cpp:958 clientgui/sg_DlgPreferences.cpp:849
+#: clientgui/DlgAdvPreferences.cpp:959 clientgui/sg_DlgPreferences.cpp:849
msgid "Validation Error"
msgstr "验证错误"
-#: clientgui/DlgAdvPreferences.cpp:1170
+#: clientgui/DlgAdvPreferences.cpp:1171
msgid "Discard local preferences and use web-based preferences?"
msgstr "放弃本地首选项并使用网上的首选项吗？"
-#: clientgui/DlgAdvPreferences.cpp:1171 clientgui/sg_DlgPreferences.cpp:1175
+#: clientgui/DlgAdvPreferences.cpp:1172 clientgui/sg_DlgPreferences.cpp:1175
msgid "Confirmation"
msgstr "确认"
@@ -1618,7 +1626,7 @@ msgstr "%s - 事件日志"
#. Create List Pane Items
#: clientgui/DlgEventLog.cpp:237 clientgui/ViewMessages.cpp:117
-#: clientgui/ViewProjects.cpp:253 clientgui/ViewStatistics.cpp:411
+#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:411
#: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
#: clientgui/ViewWork.cpp:260
msgid "Project"
@@ -1700,7 +1708,7 @@ msgid "Add an application to this list"
msgstr "在列表中增加一个应用程序"
#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
-#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:90
+#: clientgui/ViewProjects.cpp:234 clientgui/sg_ProjectCommandPopup.cpp:90
msgid "Remove"
msgstr "删除"
@@ -1800,7 +1808,7 @@ msgid "Remember this decision and do not show this dialog."
msgstr "记住当前的选择并不再显示本对话框。"
#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
-#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/DlgOptions.cpp:415 clientgui/DlgSelectComputer.cpp:168
#: clientgui/wizardex.cpp:378
msgid "&Cancel"
msgstr "取消(&C)"
@@ -1831,8 +1839,8 @@ msgstr "确认默认值"
#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
-msgid "Don't fetch tasks for "
-msgstr "禁止的任务类型 "
+msgid "Don't request tasks for "
+msgstr "不要向以下项目请求任务："
#: clientgui/DlgItemProperties.cpp:194
msgid "Project preference"
@@ -1852,13 +1860,13 @@ msgstr "客户端已排除的任务类型 "
#: clientgui/DlgItemProperties.cpp:209
#, c-format
-msgid "%s work fetch deferred for"
-msgstr "%s 的工作获取推迟"
+msgid "%s task request deferred for"
+msgstr "%s 任务请求推迟到"
#: clientgui/DlgItemProperties.cpp:213
#, c-format
-msgid "%s work fetch deferral interval"
-msgstr "%s 的工作获取延迟间隔"
+msgid "%s task request deferral interval"
+msgstr "%s 任务请求延迟间隔时间"
#. set dialog title
#: clientgui/DlgItemProperties.cpp:247
@@ -1866,7 +1874,7 @@ msgid "Properties of project "
msgstr "项目属性"
#. layout controls
-#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:232
msgid "General"
msgstr "综合"
@@ -1882,7 +1890,7 @@ msgstr "用户名称"
msgid "Team name"
msgstr "团队名称"
-#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:258
+#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:260
msgid "Resource share"
msgstr "资源分享"
@@ -1926,8 +1934,8 @@ msgid "no"
msgstr "否"
#: clientgui/DlgItemProperties.cpp:271
-msgid "Don't request more work"
-msgstr "已禁止下载新任务"
+msgid "Don't request tasks"
+msgstr "不要请求任务"
#: clientgui/DlgItemProperties.cpp:273
msgid "Scheduler call in progress"
@@ -2087,149 +2095,161 @@ msgstr "每分钟"
msgid "per second"
msgstr "每秒"
-#: clientgui/DlgItemProperties.cpp:482 clientgui/ViewWork.cpp:1125
+#: clientgui/DlgItemProperties.cpp:419
+msgid "Executable"
+msgstr "可执行文件"
+
+#: clientgui/DlgItemProperties.cpp:485 clientgui/ViewWork.cpp:1125
#: clientgui/sg_TaskPanel.cpp:828
msgid "Local: "
msgstr "本地："
-#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:130 clientgui/DlgOptions.cpp:136
msgid "Options"
msgstr "选项"
-#: clientgui/DlgOptions.cpp:178
+#: clientgui/DlgOptions.cpp:179
msgid "Language:"
msgstr "语言："
-#: clientgui/DlgOptions.cpp:185
+#: clientgui/DlgOptions.cpp:186
msgid "What language should BOINC use?"
msgstr "BOINC 应该使用哪种语言？"
-#: clientgui/DlgOptions.cpp:189
+#: clientgui/DlgOptions.cpp:190
msgid "Notice reminder interval:"
msgstr "网络通知提醒间隔："
-#: clientgui/DlgOptions.cpp:196
+#: clientgui/DlgOptions.cpp:197
msgid "How often should BOINC remind you of new notices?"
msgstr "当有新的网络通知时，BOINC 应该以多少时间间隔来提醒您？"
-#: clientgui/DlgOptions.cpp:201
+#: clientgui/DlgOptions.cpp:202
msgid "Run Manager at login?"
msgstr "在登录时运行 BOINC Manager？"
-#: clientgui/DlgOptions.cpp:207
+#: clientgui/DlgOptions.cpp:208
msgid "Run the BOINC Manager when you log on."
msgstr "在您登录的时候运行 BOINC Manager。"
-#: clientgui/DlgOptions.cpp:212
+#: clientgui/DlgOptions.cpp:213
+msgid "Run daemon?"
+msgstr "运行守护进程？"
+
+#: clientgui/DlgOptions.cpp:219
+msgid "Run daemon when launching the Manager."
+msgstr "当管理器启动时自动运行守护进程。"
+
+#: clientgui/DlgOptions.cpp:223
msgid "Enable Manager exit dialog?"
msgstr "启用 BOINC Manager 的退出消息提示："
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgOptions.cpp:229
msgid "Display the exit dialog when shutting down the Manager."
msgstr "在关闭 BOINC Manager 时显示退出消息对话框。"
-#: clientgui/DlgOptions.cpp:229
+#: clientgui/DlgOptions.cpp:240
msgid "Dial-up and Virtual Private Network settings"
msgstr "拨号及 VPN 设置"
-#: clientgui/DlgOptions.cpp:243
+#: clientgui/DlgOptions.cpp:254
msgid "&Set Default"
msgstr "设置默认值(&S)"
-#: clientgui/DlgOptions.cpp:248
+#: clientgui/DlgOptions.cpp:259
msgid "&Clear Default"
msgstr "清除默认值(&C)"
-#: clientgui/DlgOptions.cpp:255
+#: clientgui/DlgOptions.cpp:266
msgid "Default Connection:"
msgstr "缺省连接："
-#: clientgui/DlgOptions.cpp:262
+#: clientgui/DlgOptions.cpp:273
msgid "Connections"
msgstr "连接"
-#: clientgui/DlgOptions.cpp:271
+#: clientgui/DlgOptions.cpp:282
msgid "Connect via HTTP proxy server"
msgstr "通过 HTTP 代理连接"
-#: clientgui/DlgOptions.cpp:275
+#: clientgui/DlgOptions.cpp:286
msgid "HTTP Proxy Server Configuration"
msgstr "HTTP 代理配置"
-#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:294 clientgui/DlgOptions.cpp:358
msgid "Address:"
msgstr "地址："
-#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:302 clientgui/DlgOptions.cpp:366
#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
msgid "Port:"
msgstr "端口："
-#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:310 clientgui/DlgOptions.cpp:374
msgid "Don't use proxy for:"
msgstr "不要使用代理服务器："
-#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
msgid "Leave these blank if not needed"
msgstr "下面的内容如果不需要请留空"
-#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:323 clientgui/DlgOptions.cpp:387
#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
msgid "User Name:"
msgstr "用户名："
-#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:331 clientgui/DlgOptions.cpp:395
#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
#: clientgui/ProxyPage.cpp:366
msgid "Password:"
msgstr "密码："
-#: clientgui/DlgOptions.cpp:327
+#: clientgui/DlgOptions.cpp:338
msgid "HTTP Proxy"
msgstr "HTTP 代理"
-#: clientgui/DlgOptions.cpp:335
+#: clientgui/DlgOptions.cpp:346
msgid "Connect via SOCKS proxy server"
msgstr "通过 SOCKS 代理连接"
-#: clientgui/DlgOptions.cpp:339
+#: clientgui/DlgOptions.cpp:350
msgid "SOCKS Proxy Server Configuration"
msgstr "SOCKS 代理配置"
-#: clientgui/DlgOptions.cpp:391
+#: clientgui/DlgOptions.cpp:402
msgid "SOCKS Proxy"
msgstr "SOCKS 代理"
-#: clientgui/DlgOptions.cpp:589
+#: clientgui/DlgOptions.cpp:600
msgid "always"
msgstr "总是提醒"
-#: clientgui/DlgOptions.cpp:590
+#: clientgui/DlgOptions.cpp:601
msgid "1 hour"
msgstr "1 小时"
-#: clientgui/DlgOptions.cpp:591
+#: clientgui/DlgOptions.cpp:602
msgid "6 hours"
msgstr "6 小时"
-#: clientgui/DlgOptions.cpp:592
+#: clientgui/DlgOptions.cpp:603
msgid "1 day"
msgstr "1 天"
-#: clientgui/DlgOptions.cpp:593
+#: clientgui/DlgOptions.cpp:604
msgid "1 week"
msgstr "1 星期"
-#: clientgui/DlgOptions.cpp:594
+#: clientgui/DlgOptions.cpp:605
msgid "never"
msgstr "从不提醒"
-#: clientgui/DlgOptions.cpp:691
+#: clientgui/DlgOptions.cpp:703
#, c-format
msgid "%s - Language Selection"
msgstr "%s - 语言选择"
-#: clientgui/DlgOptions.cpp:698
+#: clientgui/DlgOptions.cpp:710
#, c-format
msgid ""
"The %s's language has been changed. In order for this change to take "
@@ -2375,7 +2395,7 @@ msgid "The home page of the GEO-600 project"
msgstr "GEO-600 项目的主页"
#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
-#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:441
+#: clientgui/ViewProjects.cpp:257 clientgui/ViewStatistics.cpp:441
msgid "Team"
msgstr "团队"
@@ -2439,203 +2459,203 @@ msgstr "研究"
msgid "Learn about the projects hosted at World Community Grid"
msgstr "了解 WCG 平台上的项目"
-#: clientgui/MainDocument.cpp:583
+#: clientgui/MainDocument.cpp:584
msgid "Starting client"
msgstr "正在启动客户端"
-#: clientgui/MainDocument.cpp:591
+#: clientgui/MainDocument.cpp:592
msgid "Connecting to client"
msgstr "正在连接至客户端"
-#: clientgui/MainDocument.cpp:1205
+#: clientgui/MainDocument.cpp:1206
msgid "Retrieving system state; please wait..."
msgstr "正在读取系统状态，请稍候..."
-#: clientgui/MainDocument.cpp:1826
+#: clientgui/MainDocument.cpp:1827
msgid "Missing application"
msgstr "应用程序不存在"
-#: clientgui/MainDocument.cpp:1827
+#: clientgui/MainDocument.cpp:1828
msgid ""
"Please download and install the CoRD application from "
"http://cord.sourceforge.net"
msgstr "请从 http://cord.sourceforge.net 下载并安装 CoRD 程序。"
-#: clientgui/MainDocument.cpp:2442
+#: clientgui/MainDocument.cpp:2443
msgid "on batteries"
msgstr "电池供电"
-#: clientgui/MainDocument.cpp:2443
+#: clientgui/MainDocument.cpp:2444
msgid "computer is in use"
msgstr "正在使用计算机"
-#: clientgui/MainDocument.cpp:2444
+#: clientgui/MainDocument.cpp:2445
msgid "user request"
msgstr "用户请求"
-#: clientgui/MainDocument.cpp:2445
+#: clientgui/MainDocument.cpp:2446
msgid "time of day"
msgstr "每日时间段"
-#: clientgui/MainDocument.cpp:2446
+#: clientgui/MainDocument.cpp:2447
msgid "CPU benchmarks in progress"
msgstr "正在进行 CPU 基准测试"
-#: clientgui/MainDocument.cpp:2447
+#: clientgui/MainDocument.cpp:2448
msgid "need disk space - check preferences"
msgstr "磁盘空间不足 - 请检查参数设置"
-#: clientgui/MainDocument.cpp:2448
+#: clientgui/MainDocument.cpp:2449
msgid "computer is not in use"
msgstr "计算机未在使用"
-#: clientgui/MainDocument.cpp:2449
+#: clientgui/MainDocument.cpp:2450
msgid "starting up"
msgstr "启动中"
-#: clientgui/MainDocument.cpp:2450
+#: clientgui/MainDocument.cpp:2451
msgid "an exclusive app is running"
msgstr "有互斥的应用程序在运行"
-#: clientgui/MainDocument.cpp:2451
+#: clientgui/MainDocument.cpp:2452
msgid "CPU is busy"
msgstr "CPU 忙碌中"
-#: clientgui/MainDocument.cpp:2452
+#: clientgui/MainDocument.cpp:2453
msgid "network bandwidth limit exceeded"
msgstr "网络带宽限制已超出"
-#: clientgui/MainDocument.cpp:2453
+#: clientgui/MainDocument.cpp:2454
msgid "requested by operating system"
msgstr "操作系统请求"
-#: clientgui/MainDocument.cpp:2455
+#: clientgui/MainDocument.cpp:2456
msgid "unknown reason"
msgstr "未知原因"
-#: clientgui/MainDocument.cpp:2477
+#: clientgui/MainDocument.cpp:2478
msgid "GPU missing, "
msgstr "无可用 GPU, "
-#: clientgui/MainDocument.cpp:2484
+#: clientgui/MainDocument.cpp:2485
msgid "New"
msgstr "新任务"
-#: clientgui/MainDocument.cpp:2488
+#: clientgui/MainDocument.cpp:2489
msgid "Download failed"
msgstr "下载失败"
-#: clientgui/MainDocument.cpp:2490
+#: clientgui/MainDocument.cpp:2491
msgid "Downloading"
msgstr "正在下载"
-#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
+#: clientgui/MainDocument.cpp:2493 clientgui/MainDocument.cpp:2552
msgid " (suspended - "
msgstr "(已暂停 - "
-#: clientgui/MainDocument.cpp:2500
+#: clientgui/MainDocument.cpp:2501
msgid "Project suspended by user"
msgstr "项目已被用户暂停"
-#: clientgui/MainDocument.cpp:2502
+#: clientgui/MainDocument.cpp:2503
msgid "Task suspended by user"
msgstr "任务已被用户暂停"
#. an NCI process can be running even though computation is suspended
#. (because of <dont_suspend_nci>
-#: clientgui/MainDocument.cpp:2507
+#: clientgui/MainDocument.cpp:2508
msgid "Suspended - "
msgstr "已暂停 - "
-#: clientgui/MainDocument.cpp:2510
+#: clientgui/MainDocument.cpp:2511
msgid "GPU suspended - "
msgstr "GPU 已暂停 - "
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2515
msgid "Waiting for memory"
msgstr "等待足够的内存"
-#: clientgui/MainDocument.cpp:2516
+#: clientgui/MainDocument.cpp:2517
msgid "Waiting for shared memory"
msgstr "等待足够的共享内存"
-#: clientgui/MainDocument.cpp:2518
+#: clientgui/MainDocument.cpp:2519
msgid "Running"
msgstr "运行中"
-#: clientgui/MainDocument.cpp:2520
+#: clientgui/MainDocument.cpp:2521
msgid " (non-CPU-intensive)"
msgstr "（非 CPU 密集）"
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2524
msgid "Waiting to run"
msgstr "等待运行"
-#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
+#: clientgui/MainDocument.cpp:2526 clientgui/MainDocument.cpp:2529
msgid "Ready to start"
msgstr "准备运行"
-#: clientgui/MainDocument.cpp:2532
+#: clientgui/MainDocument.cpp:2533
msgid "Postponed: "
msgstr "推迟："
-#: clientgui/MainDocument.cpp:2535
+#: clientgui/MainDocument.cpp:2536
msgid "Postponed"
msgstr "已推迟"
-#: clientgui/MainDocument.cpp:2539
+#: clientgui/MainDocument.cpp:2540
msgid "Waiting for network access"
msgstr "正在等待访问网络"
-#: clientgui/MainDocument.cpp:2543
+#: clientgui/MainDocument.cpp:2544
msgid "Computation error"
msgstr "计算错误"
-#: clientgui/MainDocument.cpp:2547
+#: clientgui/MainDocument.cpp:2548
msgid "Upload failed"
msgstr "上传失败"
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2550
msgid "Uploading"
msgstr "正在上传"
-#: clientgui/MainDocument.cpp:2560
+#: clientgui/MainDocument.cpp:2561
msgid "Aborted by user"
msgstr "已被用户中止"
-#: clientgui/MainDocument.cpp:2563
+#: clientgui/MainDocument.cpp:2564
msgid "Aborted by project"
msgstr "已被项目中止"
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2567
msgid "Aborted: not started by deadline"
msgstr "已中止：未在截止日期前开始计算"
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2570
msgid "Aborted: task disk limit exceeded"
msgstr "已中止：任务磁盘使用超出限制"
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2573
msgid "Aborted: run time limit exceeded"
msgstr "已中止：运行时间超出限制"
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2576
msgid "Aborted: memory limit exceeded"
msgstr "已中止：内存使用超出限制"
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2579
msgid "Aborted"
msgstr "已中止"
-#: clientgui/MainDocument.cpp:2583
+#: clientgui/MainDocument.cpp:2584
msgid "Acknowledged"
msgstr "已被确认"
-#: clientgui/MainDocument.cpp:2585
+#: clientgui/MainDocument.cpp:2586
msgid "Ready to report"
msgstr "等待上报"
-#: clientgui/MainDocument.cpp:2587
+#: clientgui/MainDocument.cpp:2588
#, c-format
msgid "Error: invalid state '%d'"
msgstr "错误：非法状态 '%d'"
@@ -2952,7 +2972,7 @@ msgid "'%s' does not contain a valid path."
msgstr "'%s'中未包含正确的路径。"
#. Setup View
-#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:200
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:202
#: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
#: clientgui/ViewWork.cpp:207
msgid "Commands"
@@ -3010,17 +3030,17 @@ msgstr "当前没有可以显示的通知。"
msgid "Notices"
msgstr "通知"
-#: clientgui/ViewProjects.cpp:204 clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewProjects.cpp:206 clientgui/sg_ProjectCommandPopup.cpp:66
msgid "Update"
msgstr "更新"
-#: clientgui/ViewProjects.cpp:205 clientgui/sg_ProjectCommandPopup.cpp:67
+#: clientgui/ViewProjects.cpp:207 clientgui/sg_ProjectCommandPopup.cpp:67
msgid ""
"Report all completed tasks, get latest credit, get latest preferences, and "
"possibly get more tasks."
msgstr "上报所有完成的任务，获取最新的积分及参数设置，可能下载更多的新任务。"
-#: clientgui/ViewProjects.cpp:211 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:213 clientgui/ViewProjects.cpp:812
#: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
#: clientgui/sg_BoincSimpleFrame.cpp:893
#: clientgui/sg_ProjectCommandPopup.cpp:72
@@ -3029,196 +3049,196 @@ msgstr "上报所有完成的任务，获取最新的积分及参数设置，可
msgid "Suspend"
msgstr "暂停"
-#: clientgui/ViewProjects.cpp:212 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:214 clientgui/ViewProjects.cpp:812
#: clientgui/sg_ProjectCommandPopup.cpp:73
#: clientgui/sg_ProjectCommandPopup.cpp:129
msgid "Suspend tasks for this project."
msgstr "暂停当前项目的所有任务。"
-#: clientgui/ViewProjects.cpp:218 clientgui/ViewProjects.cpp:829
+#: clientgui/ViewProjects.cpp:220 clientgui/ViewProjects.cpp:831
#: clientgui/sg_ProjectCommandPopup.cpp:78
#: clientgui/sg_ProjectCommandPopup.cpp:136
msgid "No new tasks"
msgstr "禁止下载新任务"
-#: clientgui/ViewProjects.cpp:219 clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:221 clientgui/sg_ProjectCommandPopup.cpp:79
msgid "Don't get new tasks for this project."
msgstr "该项目不再下载任何新任务。"
-#: clientgui/ViewProjects.cpp:225 clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:227 clientgui/sg_ProjectCommandPopup.cpp:84
msgid "Reset project"
msgstr "重置项目"
-#: clientgui/ViewProjects.cpp:226 clientgui/sg_ProjectCommandPopup.cpp:85
+#: clientgui/ViewProjects.cpp:228 clientgui/sg_ProjectCommandPopup.cpp:85
msgid ""
"Delete all files and tasks associated with this project, and get new tasks."
" You can update the project first to report any completed tasks."
msgstr "删除并重新下载当前项目所有相关文件。您可以先更新当前项目以上传所有已经完成的任务。"
-#: clientgui/ViewProjects.cpp:233 clientgui/sg_ProjectCommandPopup.cpp:91
+#: clientgui/ViewProjects.cpp:235 clientgui/sg_ProjectCommandPopup.cpp:91
msgid ""
"Remove this project. Tasks in progress will be lost (use 'Update' first to "
"report any completed tasks)."
msgstr "删除当前项目。该项目所有正在计算的任务将丢失，您可以先点击“更新”按钮以上报所有已经完成的任务。"
-#: clientgui/ViewProjects.cpp:239 clientgui/ViewWork.cpp:246
+#: clientgui/ViewProjects.cpp:241 clientgui/ViewWork.cpp:246
#: clientgui/sg_ProjectCommandPopup.cpp:96
#: clientgui/sg_TaskCommandPopup.cpp:84
msgid "Properties"
msgstr "属性"
-#: clientgui/ViewProjects.cpp:240 clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:242 clientgui/sg_ProjectCommandPopup.cpp:97
msgid "Show project details."
msgstr "显示项目细节。"
-#: clientgui/ViewProjects.cpp:254 clientgui/ViewStatistics.cpp:426
+#: clientgui/ViewProjects.cpp:256 clientgui/ViewStatistics.cpp:426
msgid "Account"
msgstr "帐户"
-#: clientgui/ViewProjects.cpp:256
+#: clientgui/ViewProjects.cpp:258
msgid "Work done"
msgstr "总积分"
-#: clientgui/ViewProjects.cpp:257
+#: clientgui/ViewProjects.cpp:259
msgid "Avg. work done"
msgstr "近期平均积分"
-#: clientgui/ViewProjects.cpp:259 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewProjects.cpp:261 clientgui/ViewTransfers.cpp:215
#: clientgui/ViewWork.cpp:262
msgid "Status"
msgstr "状态"
-#: clientgui/ViewProjects.cpp:338
+#: clientgui/ViewProjects.cpp:340
msgid "Projects"
msgstr "项目"
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:392
msgid "Updating project..."
msgstr "正在更新项目..."
-#: clientgui/ViewProjects.cpp:432
+#: clientgui/ViewProjects.cpp:434
msgid "Resuming project..."
msgstr "正在继续项目..."
-#: clientgui/ViewProjects.cpp:436
+#: clientgui/ViewProjects.cpp:438
msgid "Suspending project..."
msgstr "正在暂停项目..."
-#: clientgui/ViewProjects.cpp:473
+#: clientgui/ViewProjects.cpp:475
msgid "Telling project to allow additional task downloads..."
msgstr "允许项目下载更多的任务..."
-#: clientgui/ViewProjects.cpp:477
+#: clientgui/ViewProjects.cpp:479
msgid "Telling project to not fetch any additional tasks..."
msgstr "禁止项目下载更多的任务..."
-#: clientgui/ViewProjects.cpp:513
+#: clientgui/ViewProjects.cpp:515
msgid "Resetting project..."
msgstr "正在重置项目..."
-#: clientgui/ViewProjects.cpp:526 clientgui/sg_ProjectCommandPopup.cpp:229
+#: clientgui/ViewProjects.cpp:528 clientgui/sg_ProjectCommandPopup.cpp:229
#, c-format
msgid "Are you sure you want to reset project '%s'?"
msgstr "您确定要重置'%s'项目吗？"
-#: clientgui/ViewProjects.cpp:532 clientgui/sg_ProjectCommandPopup.cpp:235
+#: clientgui/ViewProjects.cpp:534 clientgui/sg_ProjectCommandPopup.cpp:235
msgid "Reset Project"
msgstr "重置项目"
-#: clientgui/ViewProjects.cpp:571
+#: clientgui/ViewProjects.cpp:573
msgid "Removing project..."
msgstr "正在删除项目..."
-#: clientgui/ViewProjects.cpp:584 clientgui/sg_ProjectCommandPopup.cpp:266
+#: clientgui/ViewProjects.cpp:586 clientgui/sg_ProjectCommandPopup.cpp:266
#, c-format
msgid "Are you sure you want to remove project '%s'?"
msgstr "您确定要删除'%s'项目吗？"
-#: clientgui/ViewProjects.cpp:590 clientgui/sg_ProjectCommandPopup.cpp:272
+#: clientgui/ViewProjects.cpp:592 clientgui/sg_ProjectCommandPopup.cpp:272
msgid "Remove Project"
msgstr "移除项目"
-#: clientgui/ViewProjects.cpp:631 clientgui/ViewWork.cpp:686
+#: clientgui/ViewProjects.cpp:633 clientgui/ViewWork.cpp:686
msgid "Launching browser..."
msgstr "正在启动浏览器..."
-#: clientgui/ViewProjects.cpp:806 clientgui/sg_ProjectCommandPopup.cpp:126
+#: clientgui/ViewProjects.cpp:808 clientgui/sg_ProjectCommandPopup.cpp:126
msgid "Resume tasks for this project."
msgstr "继续当前任务的计算。"
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:133
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:133
msgid "Allow new tasks"
msgstr "允许下载新任务"
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:134
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:134
msgid "Allow fetching new tasks for this project."
msgstr "允许当前项目下载新任务。"
-#: clientgui/ViewProjects.cpp:829 clientgui/sg_ProjectCommandPopup.cpp:137
+#: clientgui/ViewProjects.cpp:831 clientgui/sg_ProjectCommandPopup.cpp:137
msgid "Don't fetch new tasks for this project."
msgstr "禁止当前项目下载新任务。"
-#: clientgui/ViewProjects.cpp:1133
+#: clientgui/ViewProjects.cpp:1135
msgid "Requested by user"
msgstr "用户发起的请求"
-#: clientgui/ViewProjects.cpp:1134
+#: clientgui/ViewProjects.cpp:1136
msgid "To fetch work"
msgstr "获取新的任务"
-#: clientgui/ViewProjects.cpp:1135
+#: clientgui/ViewProjects.cpp:1137
msgid "To report completed tasks"
msgstr "上报已经完成的任务"
-#: clientgui/ViewProjects.cpp:1136
+#: clientgui/ViewProjects.cpp:1138
msgid "To send trickle-up message"
msgstr "发送上传消息"
-#: clientgui/ViewProjects.cpp:1137
+#: clientgui/ViewProjects.cpp:1139
msgid "Requested by account manager"
msgstr "帐户管理器发起的请求"
-#: clientgui/ViewProjects.cpp:1138
+#: clientgui/ViewProjects.cpp:1140
msgid "Project initialization"
msgstr "项目初始化"
-#: clientgui/ViewProjects.cpp:1139
+#: clientgui/ViewProjects.cpp:1141
msgid "Requested by project"
msgstr "项目发起的请求"
-#: clientgui/ViewProjects.cpp:1140
+#: clientgui/ViewProjects.cpp:1142
msgid "Unknown reason"
msgstr "未知原因"
-#: clientgui/ViewProjects.cpp:1154
+#: clientgui/ViewProjects.cpp:1156
msgid "Suspended by user"
msgstr "已被用户暂停"
-#: clientgui/ViewProjects.cpp:1157
+#: clientgui/ViewProjects.cpp:1159
msgid "Won't get new tasks"
msgstr "禁止下载新任务"
-#: clientgui/ViewProjects.cpp:1160
+#: clientgui/ViewProjects.cpp:1162
msgid "Project ended - OK to remove"
msgstr "项目已结束 - 可以删除"
-#: clientgui/ViewProjects.cpp:1163
+#: clientgui/ViewProjects.cpp:1165
msgid "Will remove when tasks done"
msgstr "将在任务完成后删除"
-#: clientgui/ViewProjects.cpp:1166
+#: clientgui/ViewProjects.cpp:1168
msgid "Scheduler request pending"
msgstr "等待调度请求"
-#: clientgui/ViewProjects.cpp:1172
+#: clientgui/ViewProjects.cpp:1174
msgid "Scheduler request in progress"
msgstr "正在进行调度请求"
-#: clientgui/ViewProjects.cpp:1175
+#: clientgui/ViewProjects.cpp:1177
msgid "Trickle up message pending"
msgstr "上传消息等待中"
-#: clientgui/ViewProjects.cpp:1181
+#: clientgui/ViewProjects.cpp:1183
msgid "Communication deferred"
msgstr "通讯被推迟"
diff --git a/version.log b/version.log
index 6d45fe0..249f6ed 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-7.6.11
+7.6.12
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list