Commit 089a63f2 authored by David Anderson's avatar David Anderson

Merge branch 'master' of ssh://boinc.berkeley.edu/boinc-v2

parents 67673ae2 92d5de0c
......@@ -112,14 +112,6 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
topControlsSizer->Add( legendSizer, 1, wxALL, 1 );
#if 0
wxStaticText* staticText321 = new wxStaticText( topControlsStaticBox, ID_DEFAULT, _("This dialog controls preferences for this computer only.\nClick OK to set preferences.\nClick Clear to restore web-based settings."), wxDefaultPosition, wxDefaultSize, 0 );
topControlsSizer->Add( staticText321, 1, wxALL, 1 );
m_btnClear = new wxButton( topControlsStaticBox, ID_BTN_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnClear->SetToolTip( _("Clear all local preferences and close the dialog.") );
#endif
m_btnClear = new wxButton( topControlsStaticBox, ID_BTN_CLEAR, _("Use web prefs"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnClear->SetToolTip( _("Restore web-based preferences and close the dialog.") );
if (!usingLocalPrefs) {
......@@ -344,7 +336,7 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
addNewRowToSizer(suspendComputingBoxSizer, MaxLoadTT, m_chkMaxLoad, m_txtMaxLoad, staticText26);
suspendComputingBoxSizer->Add(
new wxStaticText( suspendComputingStaticBox, ID_DEFAULT, wxT("To suspend by time of day, see the \"Daily Schedules\" section."), wxDefaultPosition, wxDefaultSize, 0),
new wxStaticText( suspendComputingStaticBox, ID_DEFAULT, _("To suspend by time of day, see the \"Daily Schedules\" section."), wxDefaultPosition, wxDefaultSize, 0),
0, wxALL, 5
);
......@@ -510,7 +502,7 @@ wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
addNewRowToSizer(networkUsageLimitsBoxSizer, daily_xfer_limitTT, m_chk_daily_xfer_limit, m_txt_daily_xfer_limit_mb, staticText_daily_xfer2, m_txt_daily_xfer_period_days, staticText_daily_xfer4);
networkUsageLimitsBoxSizer->Add(
new wxStaticText( networkUsageLimitsStaticBox, ID_DEFAULT, wxT("To limit transfers by time of day, see the \"Daily Schedules\" section."), wxDefaultPosition, wxDefaultSize, 0),
new wxStaticText( networkUsageLimitsStaticBox, ID_DEFAULT, _("To limit transfers by time of day, see the \"Daily Schedules\" section."), wxDefaultPosition, wxDefaultSize, 0),
0, wxALL, 5
);
......
......@@ -205,8 +205,14 @@ void CDlgItemProperties::show_rsc(wxString rsc_name, RSC_DESC rsc_desc) {
double x = rsc_desc.backoff_time - dtime();
if (x<0) x = 0;
if (x) {
addProperty(rsc_name + _(" work fetch deferred for"), FormatTime(x));
addProperty(rsc_name + _(" work fetch deferral interval"), FormatTime(rsc_desc.backoff_interval));
addProperty(
wxString::Format(_("%s work fetch deferred for"), rsc_name.c_str()),
FormatTime(x)
);
addProperty(
wxString::Format(_("%s work fetch deferral interval"), rsc_name.c_str()),
FormatTime(rsc_desc.backoff_interval)
);
}
}
......@@ -289,15 +295,17 @@ void CDlgItemProperties::renderInfos(PROJECT* project_in) {
addSection(_("Credit"));
addProperty(_("User"),
// Displays the average and total user credit
wxString::Format(
wxT("%0.2f total, %0.2f average"),
_("%0.2f total, %0.2f average"),
project->user_total_credit,
project->user_expavg_credit
)
);
addProperty(_("Host"),
// Displays the average and total host credit
wxString::Format(
wxT("%0.2f total, %0.2f average"),
_("%0.2f total, %0.2f average"),
project->host_total_credit,
project->host_expavg_credit
)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment