diff --git a/android/BOINC/res/values-fr/strings.xml b/android/BOINC/res/values-fr/strings.xml
index 87453cb8e6..3d61eb5eb8 100644
--- a/android/BOINC/res/values-fr/strings.xml
+++ b/android/BOINC/res/values-fr/strings.xml
@@ -8,7 +8,7 @@
Terminer
- Choisir un projet scientifique auquel vous voulez collaborer:
+ Choisir un projet scientifique auquel vous voulez collaborer :
Choisissez un projet
Ajouter un projet via son URL
URL du projet:
@@ -120,7 +120,7 @@
Synchroniser
Touchez ici pour choisir un projet.
- Oups!
+ Oups !
...ceci ne devrait pas se produire!\nCliquer sur l\'icône pour essayer de nouveau.
Icône de BOINC
@@ -171,9 +171,9 @@
Température batterie maximale.
BOINC suspend le calcul au dessus de la température de batterie définie. Il n\'est pas recommandé de modifier cette valeur.
Espace de stockage utilisé maximum
- Quel pourcentage de l\'espace de stockage BOINC peut-il utiliser ?
+ Quel pourcentage de l\'espace de stockage BOINC peut-il utiliser ?
Capacité de stockage minimum
- Quelle capacité de stockage de votre appareil doit rester disponible ?
+ Quelle capacité de stockage de votre appareil doit rester disponible ?
Intervalle d\'accès
Suggère un intervalle entre les accès disque
Limite de transfert journalier
@@ -182,7 +182,7 @@
Démarage automatique
Afficher les notifications pour les nouvelles remarques
Afficher les notifications lorsque suspendu
- Cores CPU utilisés
+ Cœurs du CPU utilisés
Limiter le nombre de cores CPU que BOINC peut utiliser pour le calcul.
Mettre en pause si l\'utilisation du CPU dépasse
Détermine si BOINC doit suspendre les calculs du fait de l\'exécution d\'autres applications.
@@ -192,7 +192,7 @@
Limite la quantité de RAM que les tâches peuvent utiliser.
Drapeaux de journal du client BOINC
Journal niveau GUI
- Définit le niveau de détail des messages du journal GUI
+ Définit le niveau de détail de la GUI des messages du journal
Mo
Go
%
@@ -207,7 +207,7 @@
(total)
Suspendu par l\'utilisateur
- Pas de nouveau travail
+ Pas de nouvelle tâche
Projet terminé - OK pour le retirer.
Se détacher une fois les tâches terminées
Requête au planificateur en attente
@@ -216,21 +216,21 @@
Communication prévue dans:
Commandes du projet:
- Visitez le site web
+ Visitez le site Web
Mise à jour
Supprimer
Suspendre
Reprendre
- Pas de nouveau travail
- Autoriser du nouveau travail
+ Pas de nouvelle tâche
+ Autoriser une nouvelle tâche
Réinitialiser
Commandes du gestionnaire de compte:
Synchroniser
Désactiver
- Supprimer le projet?
+ Supprimer le projet ?
Êtes-vous sûr de vouloir supprimer
- de BOINC ?
+ de BOINC ?
Supprimer
Recommencer le projet
Êtes-vous sûr de vouloir recommencer
@@ -249,7 +249,7 @@
En attente de téléchargement
Téléchargement terminé
erreur de calcul
- Téléversement (upload)
+ Transférer
Mise à jour effectuée
annulé
échec du chargement
@@ -262,8 +262,8 @@
projet suspendu
prêt à valider
- Abandonner la tâche?
- Abandonner la tâche:
+ Abandonner la tâche ?
+ Abandonner la tâche :
Abandonner
Annuler
Confirmation
@@ -277,17 +277,17 @@
actif
en attente
retrait de projet
- Fichier:
+ Fichier :
Réessayer le transfert
- Annuler le transfert?
- Annuler le transfert de fichier
+ Annuler le transfert ?
+ Abandonner le fichier :
Abandonner
Lecture des remarques...
Chargement du journal de messages...
Messages du client
- Messages GUI
+ GUI des Messages
Journal copié dans le presse-papier.
Journal de message pour le client BOINC Android:
@@ -323,18 +323,18 @@
Demandé par le projet
Raison inconnue
- Rafraichir
- Envoyer via un email
+ Rafraîchir
+ Envoyer en e-mail
Copier dans le presse-papier
Journal des évènements
Fermer BOINC
Suspendre
Reprendre
- A propos de
+ A propos
Aide
Retour
- A propos de
+ A propos
BOINC
Version
Berkeley Open Infrastructure for Network Computing
@@ -352,9 +352,9 @@
Quitter
Inviter des amis
- Comment voulez-vous partager ?
- Je fais du calcul scientifique sur mon smatphone !
- J\'utilise mon %1$s pour faire du calcul scientifique. Vous pouvez le faire aussi! Téléchargez l\'application à partir de: %2$s
+ Comment voulez-vous partager ?
+ Je fais du calcul scientifique sur mon smatphone !
+ J\'utilise mon %1$s pour faire du calcul scientifique. Vous pouvez le faire aussi ! Téléchargez l\'application à partir de : %2$s
https://play.google.com/store/apps/details?id=edu.berkeley.boinc
diff --git a/client/gpu_detect.cpp b/client/gpu_detect.cpp
index 1c2b06718e..d69299d8b0 100644
--- a/client/gpu_detect.cpp
+++ b/client/gpu_detect.cpp
@@ -670,7 +670,7 @@ void COPROCS::bound_counts() {
for (int j=1; j MAX_COPROC_INSTANCES) {
diff --git a/clientgui/BOINCListCtrl.cpp b/clientgui/BOINCListCtrl.cpp
index c0a34cbbe1..f739ad3e70 100644
--- a/clientgui/BOINCListCtrl.cpp
+++ b/clientgui/BOINCListCtrl.cpp
@@ -230,6 +230,10 @@ bool CBOINCListCtrl::OnRestoreState(wxConfigBase* pConfig) {
// If the user installed a new vesion of BOINC, new columns may have
// been added that didn't exist in the older version. Check for this.
+ //
+ // This will also be triggered if the locale is changed, which will cause
+ // SetListColumnOrder() to be called again so the wxListCtrl will be set
+ // up with the correctly labeled columns.
bool foundNewColumns = false;
if (pConfig->Read(wxT("HiddenColumns"), &strHiddenColumns)) {
@@ -273,9 +277,6 @@ bool CBOINCListCtrl::OnRestoreState(wxConfigBase* pConfig) {
SetDefaultColumnDisplay();
}
-
-
-
if (m_pParentView->m_iSortColumnID != -1) {
m_pParentView->InitSort();
@@ -351,9 +352,10 @@ void CBOINCListCtrl::SetListColumnOrder(wxArrayString& orderArray) {
//
// CBOINCListCtrl::OnRestoreState() may have incorrectly added the column names in
// the new locale as "new" columns, so check against both shownColCount and stdCount.
- if (columnIndex < wxMin(shownColCount, stdCount)) {
+ int limit = wxMin(shownColCount, stdCount);
+ if (columnIndex < limit) {
SetStandardColumnOrder();
- for (columnID=0; columnIDAppendColumn(columnID);
pView->m_iColumnIndexToColumnID.Add(columnID);
diff --git a/clientgui/DlgAdvPreferencesBase.cpp b/clientgui/DlgAdvPreferencesBase.cpp
index bff3976870..66a9ac6b7f 100644
--- a/clientgui/DlgAdvPreferencesBase.cpp
+++ b/clientgui/DlgAdvPreferencesBase.cpp
@@ -308,6 +308,7 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
wxStaticText* staticText24 = new wxStaticText(
suspendComputingStaticBox, ID_DEFAULT,
+ // context: 'In use' means mouse/keyboard input in last ___ minutes
_("'In use' means mouse/keyboard input in last"),
wxDefaultPosition, wxDefaultSize, 0
);
@@ -316,8 +317,12 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
suspendComputingStaticBox, ID_TXTPROCIDLEFOR, wxEmptyString, wxDefaultPosition, getTextCtrlSize(wxT("999.99")), wxTE_RIGHT
);
- wxStaticText* staticText25 = new wxStaticText(suspendComputingStaticBox, ID_DEFAULT, _("minutes"),
- wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText* staticText25 = new wxStaticText(
+ suspendComputingStaticBox, ID_DEFAULT,
+ // context: 'In use' means mouse/keyboard input in last ___ minutes
+ _("minutes"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
addNewRowToSizer(suspendComputingBoxSizer, ProcIdleForTT, staticText24, m_txtProcIdleFor, staticText25);
@@ -346,7 +351,11 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
processorTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
processorTabSizer->Add( suspendComputingBoxSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
- wxStaticBox* miscProcStaticBox = new wxStaticBox( processorTab, -1, _("Other") );
+ wxStaticBox* miscProcStaticBox = new wxStaticBox(
+ processorTab, -1,
+ // Context: heading for a group of miscellaneous preferences
+ _("Other")
+ );
wxStaticBoxSizer* miscProcBoxSizer = new wxStaticBoxSizer( miscProcStaticBox, wxVERTICAL );
makeStaticBoxLabelItalic(miscProcStaticBox);
@@ -354,7 +363,9 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
wxString NetConnectIntervalTT(_("Store at least enough tasks to keep the computer busy for this long."));
wxStaticText* staticText30 = new wxStaticText(
miscProcStaticBox, ID_DEFAULT,
- _("Store at least"), wxDefaultPosition, wxDefaultSize, 0
+ // context: Store at least ___ days of work
+ _("Store at least"),
+ wxDefaultPosition, wxDefaultSize, 0
);
m_txtNetConnectInterval = new wxTextCtrl(
@@ -362,7 +373,10 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
);
wxStaticText* staticText31 = new wxStaticText(
- miscProcStaticBox, ID_DEFAULT, _("days of work"), wxDefaultPosition, wxDefaultSize, 0
+ miscProcStaticBox, ID_DEFAULT,
+ // context: Store at least ___ days of work
+ _("days of work"),
+ wxDefaultPosition, wxDefaultSize, 0
);
addNewRowToSizer(miscProcBoxSizer, NetConnectIntervalTT, staticText30, m_txtNetConnectInterval, staticText31);
@@ -370,7 +384,9 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
wxString NetAdditionalDaysTT(_("Store additional tasks above the minimum level. Determines how much work is requested when contacting a project."));
wxStaticText* staticText331 = new wxStaticText(
miscProcStaticBox, ID_DEFAULT,
- _("Store up to an additional"), wxDefaultPosition, wxDefaultSize, 0
+ // context: Store up to an additional ___ days of work
+ _("Store up to an additional"),
+ wxDefaultPosition, wxDefaultSize, 0
);
staticText331->SetToolTip(NetAdditionalDaysTT);
@@ -378,27 +394,52 @@ wxPanel* CDlgAdvPreferencesBase::createProcessorTab(wxNotebook* notebook)
miscProcStaticBox, ID_TXTNETADDITIONALDAYS, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT
);
- wxStaticText* staticText341 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("days of work"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText* staticText341 = new wxStaticText(
+ miscProcStaticBox, ID_DEFAULT,
+ // context: Store up to an additional ___ days of work
+ _("days of work"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
addNewRowToSizer(miscProcBoxSizer, NetAdditionalDaysTT, staticText331, m_txtNetAdditionalDays, staticText341);
wxString ProcSwitchEveryTT = wxEmptyString;
ProcSwitchEveryTT.Printf(_("If you run several projects, %s may switch between them this often."), pSkinAdvanced->GetApplicationShortName().c_str());
- wxStaticText* staticText18 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("Switch between tasks every"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText* staticText18 = new wxStaticText(
+ miscProcStaticBox, ID_DEFAULT,
+ // context: Switch between tasks every ___ minutes
+ _("Switch between tasks every"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
m_txtProcSwitchEvery = new wxTextCtrl( miscProcStaticBox, ID_TXTPROCSWITCHEVERY, wxEmptyString, wxDefaultPosition, getTextCtrlSize(wxT("9999.99")), wxTE_RIGHT );
- wxStaticText* staticText19 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText* staticText19 = new wxStaticText(
+ miscProcStaticBox, ID_DEFAULT,
+ // context: Switch between tasks every ___ minutes
+ _("minutes"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
addNewRowToSizer(miscProcBoxSizer, ProcSwitchEveryTT, staticText18, m_txtProcSwitchEvery, staticText19);
wxString DiskWriteToDiskTT(_("This controls how often tasks save their state to disk, so that they can be restarted later."));
- wxStaticText* staticText46 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("Request tasks to checkpoint at most every"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText* staticText46 = new wxStaticText(
+ miscProcStaticBox, ID_DEFAULT,
+ // context: Request tasks to checkpoint at most every ___ seconds
+ _("Request tasks to checkpoint at most every"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
m_txtDiskWriteToDisk = new wxTextCtrl( miscProcStaticBox, ID_TXTDISKWRITETODISK, wxEmptyString, wxDefaultPosition, textCtrlSize, wxTE_RIGHT );
- wxStaticText* staticText47 = new wxStaticText( miscProcStaticBox, ID_DEFAULT, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 );
+ wxStaticText* staticText47 = new wxStaticText(
+ miscProcStaticBox, ID_DEFAULT,
+ // context: Request tasks to checkpoint at most every ___ seconds
+ _("seconds"),
+ wxDefaultPosition, wxDefaultSize, 0
+ );
addNewRowToSizer(miscProcBoxSizer, DiskWriteToDiskTT, staticText46, m_txtDiskWriteToDisk, staticText47);
@@ -476,7 +517,12 @@ wxPanel* CDlgAdvPreferencesBase::createNetworkTab(wxNotebook* notebook)
networkTabSizer->AddSpacer( STATICBOXVERTICALSPACER );
networkTabSizer->Add( networkUsageLimitsBoxSizer, 0, wxLEFT | wxRIGHT | wxEXPAND, STATICBOXBORDERSIZE );
- wxStaticBox* connectOptionsStaticBox = new wxStaticBox( networkTab, -1, _("Other") );
+ // Context: heading for a group of miscellaneous preferences
+ wxStaticBox* connectOptionsStaticBox = new wxStaticBox(
+ networkTab, -1,
+ // Context: heading for a group of miscellaneous preferences
+ _("Other")
+ );
wxStaticBoxSizer* connectOptionsSizer = new wxStaticBoxSizer( connectOptionsStaticBox, wxVERTICAL );
makeStaticBoxLabelItalic(connectOptionsStaticBox);
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index 20c64e5869..2d3569ac01 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -254,7 +254,7 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
// Entries must be in order of ascending Column ID. We initalize
// it here to the default column widths. It is updated by
// CBOINCListCtrl::OnRestoreState() and also when a user resizes
- // a column bby dragging the divider between two columns.
+ // a column by dragging the divider between two columns.
//
m_iStdColWidthOrder.Clear();
m_iStdColWidthOrder.Insert(150, COLUMN_PROJECT);
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index 8a0a9e6ddb..7373c9e0b8 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -218,7 +218,7 @@ CViewTransfers::CViewTransfers(wxNotebook* pNotebook) :
// Entries must be in order of ascending Column ID. We initalize
// it here to the default column widths. It is updated by
// CBOINCListCtrl::OnRestoreState() and also when a user resizes
- // a column bby dragging the divider between two columns.
+ // a column by dragging the divider between two columns.
//
m_iStdColWidthOrder.Clear();
m_iStdColWidthOrder.Insert(125, COLUMN_PROJECT);
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index 0d0324b195..f354029318 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -270,7 +270,7 @@ CViewWork::CViewWork(wxNotebook* pNotebook) :
// Entries must be in order of ascending Column ID. We initalize
// it here to the default column widths. It is updated by
// CBOINCListCtrl::OnRestoreState() and also when a user resizes
- // a column bby dragging the divider between two columns.
+ // a column by dragging the divider between two columns.
//
m_iStdColWidthOrder.Clear();
m_iStdColWidthOrder.Insert(125, COLUMN_PROJECT);
diff --git a/clientgui/WizardAttach.cpp b/clientgui/WizardAttach.cpp
index c4b7ec7148..7e957cfd21 100644
--- a/clientgui/WizardAttach.cpp
+++ b/clientgui/WizardAttach.cpp
@@ -432,7 +432,15 @@ bool CWizardAttach::HasNextPage( wxWizardPageEx* page )
bool CWizardAttach::HasPrevPage( wxWizardPageEx* page )
{
- if ((page == m_ProjectWelcomePage) || (page == m_CompletionPage) || (page == m_CompletionErrorPage))
+ bool bNoPrevPageDetected = false;
+
+ bNoPrevPageDetected |= (page == m_ProjectWelcomePage);
+ bNoPrevPageDetected |= (page == m_ProjectInfoPage);
+ bNoPrevPageDetected |= (page == m_AccountManagerInfoPage);
+ bNoPrevPageDetected |= (page == m_CompletionPage);
+ bNoPrevPageDetected |= (page == m_CompletionErrorPage);
+
+ if (bNoPrevPageDetected)
return false;
return true;
}
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index 25d73e5269..823f0fa561 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -205,7 +205,6 @@ void CPanelPreferences::CreateControls()
CTransparentStaticText* itemStaticText7 = new CTransparentStaticText( topSectionStaticBox, wxID_ANY, _("For additional settings, select Computing Preferences in the Advanced View."), wxDefaultPosition, wxDefaultSize, 0 );
- // itemStaticText7->SetFont(wxFont(MEDIUM_FONT, wxSWISS, wxNORMAL, wxBOLD, false, _T("Arial")));
topSectionSizer->Add(itemStaticText7, 0, wxALL, 0);
topSectionSizer->AddSpacer( 10 );
@@ -228,10 +227,6 @@ void CPanelPreferences::CreateControls()
#endif
}
-// wxFlexGridSizer* itemFlexGridSizer9 = new wxFlexGridSizer(1, 1, 0, 0);
-// itemFlexGridSizer9->AddGrowableCol(0);
-// itemBoxSizer2->Add(itemFlexGridSizer9, 0, wxGROW|wxALL, ADJUSTFORXDPI(5));
-
wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer2->Add(itemBoxSizer11, 0, wxLEFT, ADJUSTFORXDPI(20));
@@ -353,11 +348,6 @@ void CPanelPreferences::CreateControls()
itemBoxSizer44->Add(itemButton44, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
-// m_btnClear = new wxButton( this, ID_SGPREFERENCESCLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
-// m_btnClear->SetToolTip( _("Clear all local preferences listed above and close the dialog") );
-
-// itemBoxSizer44->Add(m_btnClear, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
-
wxButton* itemButton45 = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer44->Add(itemButton45, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
diff --git a/doc/email_lists.php b/doc/email_lists.php
index 65e6da4e7e..861698c1af 100644
--- a/doc/email_lists.php
+++ b/doc/email_lists.php
@@ -1,7 +1,7 @@
boinc_cvs",
- "Summaries of BOINC CVS checkins are posted to this list.
+ "Summaries of changes to the BOINC source code are posted to this list.
No other posts, please."
);
list_item("boinc_opt",
diff --git a/doc/white.css b/doc/white.css
index 0a57fca716..739a9e0bae 100644
--- a/doc/white.css
+++ b/doc/white.css
@@ -55,8 +55,8 @@ body {
}
span.title{
- font-variant: small-caps;
- font-size: 2em;
+#font-variant: small-caps;
+ font-size: 1.8em;
}
span.subtitle{
font-size: 1.3em;
diff --git a/locale/fr/BOINC-Client.po b/locale/fr/BOINC-Client.po
old mode 100755
new mode 100644
index 0333dc3bc0..d1e3ec6afb
--- a/locale/fr/BOINC-Client.po
+++ b/locale/fr/BOINC-Client.po
@@ -1,22 +1,22 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
+#
+# Translators:
+# Axelle Andy , 2015
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: BOINC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-15 22:25-0700\n"
-"PO-Revision-Date: 2013-10-06 19:49+0000\n"
-"Last-Translator: Jerome Cadet \n"
-"Language-Team: LANGUAGE \n"
-"Language: fr\n"
+"PO-Revision-Date: 2015-05-01 12:43+0000\n"
+"Last-Translator: Axelle Andy \n"
+"Language-Team: French (http://www.transifex.com/projects/p/boinc/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 2.5.0\n"
-"X-POOTLE-MTIME: 1381088965.0\n"
#: acct_mgr.cpp:450 acct_mgr.cpp:459
msgid "Message from account manager"
@@ -30,14 +30,11 @@ msgstr "Message du serveur"
msgid ""
"Some tasks need more memory than allowed by your preferences. Please check "
"the preferences."
-msgstr ""
-"Certaines tâches ont besoin de plus de mémoire que ce qui est permis par vos "
-"préférences : veuillez les vérifier."
+msgstr "Certaines tâches ont besoin de plus de mémoire que celle permise dans vos préférences. Merci de vérifier les préférences."
#: client_state.cpp:520
msgid "Couldn't write state file; check directory permissions"
-msgstr ""
-"Écriture du fichier d'état impossible; vérifiez les droits des répertoires"
+msgstr "Impossible d'écrire dans le fichier d'état ; Vérifiez les autorisations de répertoire"
#: cs_cmdline.cpp:303
msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
@@ -48,9 +45,7 @@ msgstr "La variable d'environnement HTTP_PROXY doit définir un proxy HTTP"
msgid ""
"You used the wrong URL for this project. When convenient, remove this "
"project, then add %s"
-msgstr ""
-"Vous avez utilisé la mauvaise URL pour ce projet. Retirez ce projet puis "
-"ajoutez de nouveau %s"
+msgstr "Vous avez utilisé la mauvaise URL pour ce projet. Retirez ce projet puis ajoutez de nouveau %s"
#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
msgid "Syntax error in app_info.xml"
@@ -90,23 +85,17 @@ msgstr "Balise de fin manquante dans cc_config.xml"
#: ../sched/handle_request.cpp:307
msgid "Invalid or missing account key. To fix, remove and add this project."
-msgstr ""
-"Clé de compte invalide ou manquante. Veuillez retirer puis ajouter ce projet "
-"à nouveau."
+msgstr "Clé de compte invalide ou manquante. Veuillez retirer puis ajouter ce projet à nouveau."
#: ../sched/handle_request.cpp:849
msgid "Invalid code signing key. To fix, remove and add this project."
-msgstr ""
-"Clé de signature de code invalide. Veuillez retirer puis ajouter ce projet à "
-"nouveau."
+msgstr "Clé de signature de code invalide. Veuillez retirer puis ajouter ce projet à nouveau."
#: ../sched/handle_request.cpp:859
msgid ""
"The project has changed its security key. Please remove and add this "
"project."
-msgstr ""
-"Le projet a changé sa clé de sécurité. Veuillez retirer et ajouter à nouveau "
-"ce projet."
+msgstr "Le projet a changé sa clé de sécurité. Veuillez retirer et ajouter à nouveau ce projet."
#: ../sched/handle_request.cpp:943
msgid "This project doesn't support operating system"
@@ -119,48 +108,36 @@ msgstr "Ce projet ne supporte pas ce type de processeur"
#: ../sched/handle_request.cpp:993
msgid ""
"Your BOINC client software is too old. Please install the current version."
-msgstr ""
-"Votre logiciel client BOINC est trop ancien. Merci d'installer la dernière "
-"version."
+msgstr "Votre logiciel client BOINC est trop ancien. Merci d'installer la dernière version."
#: ../sched/handle_request.cpp:1259
msgid "This project doesn't support computers of type"
msgstr "Ce projet ne supporte pas les ordinateurs de ce type"
#: ../sched/sched_send.cpp:1092
-msgid "Upgrade to the latest driver to process tasks using your computer's GPU"
-msgstr ""
-"Veuillez mettre à jour votre système avec les derniers drivers pour pouvoir "
-"calculer avec le GPU"
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
+msgstr "Veuillez mettre à jour votre système avec les derniers drivers pour pouvoir calculer avec le GPU"
#: ../sched/sched_send.cpp:1099
msgid ""
"Upgrade to the latest driver to use all of this project's GPU applications"
-msgstr ""
-"Veuillez mettre à jour votre système avec les derniers drivers pour pouvoir "
-"calculer toutes les applications GPU de ce projet"
+msgstr "Veuillez mettre à jour votre système avec les derniers drivers pour pouvoir calculer toutes les applications GPU de ce projet"
#: ../sched/sched_send.cpp:1118
msgid ""
-"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to "
-"the current version"
-msgstr ""
-"Une version plus récente de BOINC est requise pour utiliser votre GPU "
-"NVIDIA; merci de mettre à jour avec la dernière version"
+"A newer version of BOINC is needed to use your NVIDIA GPU; please upgrade to"
+" the current version"
+msgstr "Une version plus récente de BOINC est requise pour utiliser votre GPU NVIDIA; merci de mettre à jour avec la dernière version"
-# 94%
#: ../sched/sched_send.cpp:1146
#, c-format
-#, c-format, c-format
msgid "An %s GPU is required to run tasks for this project"
-msgstr ""
-"Un processeur graphique %s est nécessaire pour effectuer les tâches de ce "
-"projet"
+msgstr "Un processeur graphique %s est nécessaire pour effectuer les tâches de ce projet"
#: ../sched/sched_send.cpp:1262
msgid "No tasks are available for the applications you have selected."
-msgstr ""
-"Aucune tâche disponible pour les applications que vous avez sélectionnées."
+msgstr "Aucune tâche disponible pour les applications que vous avez sélectionnées."
#: ../sched/sched_send.cpp:1288
msgid "Your computer type is not supported by this project"
@@ -168,17 +145,13 @@ msgstr "Votre ordinateur n'est pas supporté par ce projet"
#: ../sched/sched_send.cpp:1294
msgid "Newer BOINC version required; please install current version"
-msgstr ""
-"La nouvelle version de BOINC est nécessaire; merci d'installer la dernière "
-"version"
+msgstr "La nouvelle version de BOINC est nécessaire; merci d'installer la dernière version"
#: ../sched/sched_send.cpp:1305
#, c-format
msgid ""
"Tasks for %s are available, but your preferences are set to not accept them"
-msgstr ""
-"Les tâches pour %s sont disponibles, mais on charge que vos préférences pas "
-"les acceptent"
+msgstr "Les tâches pour %s sont disponibles, mais on charge que vos préférences pas les acceptent"
#: ../sched/sched_types.cpp:254
msgid "Unknown app name in app_info.xml"
@@ -187,63 +160,3 @@ msgstr "Nom de programme inconnu dans app_info.xml"
#: ../sched/sched_version.cpp:214
msgid "Your app_info.xml file doesn't have a usable version of"
msgstr "Votre fichier app_info.xml n'a pas une version utilisable de"
-
-#~ msgid "Download it."
-#~ msgstr "Télécharger la."
-
-#~ msgid "An NVIDIA or ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Un processeur graphique NVIDIA ou ATI est nécessaire pour effectuer les "
-#~ "taches de ce projet"
-
-#~ msgid "An NVIDIA GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Un processeur graphique NVIDIA est nécessaire pour effectuer les taches de "
-#~ "ce projet"
-
-#~ msgid "An ATI GPU is required to run tasks for this project"
-#~ msgstr ""
-#~ "Un processeur graphique ATI est nécessaire pour effectuer les taches de ce "
-#~ "projet"
-
-#~ msgid ""
-#~ "Tasks for NVIDIA GPU are available, but your preferences are set to not "
-#~ "accept them"
-#~ msgstr ""
-#~ "Des taches sont disponibles pour votre processeur graphique NVIDIA, mais vos "
-#~ "préférences sont réglées pour les refuser."
-
-#~ msgid ""
-#~ "Tasks for ATI GPU are available, but your preferences are set to not accept "
-#~ "them"
-#~ msgstr ""
-#~ "Des taches sont disponibles pour votre processeur graphique ATI, mais vos "
-#~ "préférences sont réglées pour les refuser."
-
-#~ msgid ""
-#~ "Tasks for CPU are available, but your preferences are set to not accept them"
-#~ msgstr ""
-#~ "Des taches sont disponibles pour votre processeur, mais vos préférences sont "
-#~ "réglées pour les refuser."
-
-#~ msgid "error"
-#~ msgstr "Erreur"
-
-#~ msgid "Can't resolve hostname in remote_hosts.cfg"
-#~ msgstr "Nom de domaine non résolu dans remote_hosts.cfg"
-
-#~ msgid "is not available for"
-#~ msgstr "n'est pas disponible pour "
-
-#~ msgid "Notice from BOINC"
-#~ msgstr "Notification de BOINC"
-
-#~ msgid "Message from"
-#~ msgstr "Message de"
-
-#~ msgid ""
-#~ "You may have an outdated code signing key. Try attaching and reattaching "
-#~ "this project."
-#~ msgstr ""
-#~ "Vous avez peut-être une clé de signature de code périmée. Veuillez "
-#~ "quitter puis rejoindre à nouveau ce projet."
diff --git a/locale/fr/BOINC-Manager.po b/locale/fr/BOINC-Manager.po
index 838cb8dcfe..6478c8c8fd 100644
--- a/locale/fr/BOINC-Manager.po
+++ b/locale/fr/BOINC-Manager.po
@@ -4,6 +4,7 @@
#
# Translators:
# Arnaud , 2007
+# Axelle Andy , 2015
# BUNS Nicolas, 2015
# Jerome Cadet , 2015
# PINSET Romaric , 2015
@@ -11,24 +12,24 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-24 13:36-0500\n"
-"PO-Revision-Date: 2015-04-23 09:24+0000\n"
-"Last-Translator: Jerome Cadet \n"
+"POT-Creation-Date: 2015-04-30 14:53-0500\n"
+"PO-Revision-Date: 2015-05-01 12:23+0000\n"
+"Last-Translator: Axelle Andy \n"
"Language-Team: French (http://www.transifex.com/projects/p/boinc/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.7.6\n"
"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-Poedit-Country: UNITED STATES\n"
-"X-Poedit-Language: English\n"
+"X-Poedit-KeywordsList: _\n"
"X-Poedit-SearchPath-0: clientgui\n"
"X-Poedit-SearchPath-1: clientgui\\common\n"
"X-Poedit-SearchPath-2: clientgui\\gtk\n"
-"X-Poedit-SearchPath-3: clientgui\\mac\n"
-"X-Poedit-SearchPath-4: clientgui\\msw\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-3: clientgui\\msw\n"
+"X-Poedit-SearchPath-4: clientgui\\mac\n"
+"X-Poedit-SourceCharset: UTF-8\n"
#: clientgui/AccountInfoPage.cpp:361
#, c-format
@@ -178,6 +179,8 @@ msgstr "Ouvrir une page web"
msgid "Visit this account manager's web site"
msgstr "Visiter le site web du gestionnaire de compte"
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
#: clientgui/AccountManagerProcessingPage.cpp:186
#: clientgui/AccountManagerPropertiesPage.cpp:192
#, c-format
@@ -206,364 +209,369 @@ msgstr "Connecté"
msgid "Disconnected"
msgstr "Déconnecté"
-#: clientgui/AdvancedFrame.cpp:325
+#: clientgui/AdvancedFrame.cpp:327
#, c-format
msgid "New %s window..."
msgstr "Nouveauté %s fenêtre..."
-#: clientgui/AdvancedFrame.cpp:329
+#: clientgui/AdvancedFrame.cpp:331
#, c-format
msgid "Open another %s window"
msgstr "Ouvrir une autre %s fenêtre"
-#: clientgui/AdvancedFrame.cpp:340
+#: clientgui/AdvancedFrame.cpp:342
msgid "Select computer..."
msgstr "Sélectionner un ordinateur..."
-#: clientgui/AdvancedFrame.cpp:341
+#: clientgui/AdvancedFrame.cpp:343
msgid "Connect to a BOINC client on another computer"
msgstr "Se connecter au client BOINC depuis un autre ordinateur"
-#: clientgui/AdvancedFrame.cpp:345
+#: clientgui/AdvancedFrame.cpp:347
msgid "Shut down connected client..."
msgstr "Arrêter le client connecté..."
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:348
msgid "Shut down the currently connected BOINC client"
msgstr "Fermer le client BOINC actuellement connecté "
-#: clientgui/AdvancedFrame.cpp:351
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
#, c-format
msgid "Close the %s window"
msgstr "Fermez la fenêtre %s"
-#: clientgui/AdvancedFrame.cpp:354
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
msgid "&Close window"
msgstr "&Fermer la fenêtre"
-#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
-#: clientgui/AdvancedFrame.cpp:373
+#: clientgui/AdvancedFrame.cpp:365 clientgui/AdvancedFrame.cpp:370
+#: clientgui/AdvancedFrame.cpp:375 clientgui/sg_BoincSimpleFrame.cpp:132
+#: clientgui/sg_BoincSimpleFrame.cpp:137
#, c-format
msgid "Exit %s"
msgstr "Quitter %s"
-#: clientgui/AdvancedFrame.cpp:386
-msgid "Preferences…"
+#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+msgid "Preferences..."
msgstr "Préférences..."
-#: clientgui/AdvancedFrame.cpp:395
+#: clientgui/AdvancedFrame.cpp:398
msgid "&Notices\tCtrl+Shift+N"
msgstr "&Remarques\tCtrl+Shift+N"
-#: clientgui/AdvancedFrame.cpp:396
+#: clientgui/AdvancedFrame.cpp:399
msgid "Show notices"
msgstr "Montrer les notifications"
-#: clientgui/AdvancedFrame.cpp:401
+#: clientgui/AdvancedFrame.cpp:404
msgid "&Projects\tCtrl+Shift+P"
msgstr "&Projets\tCtrl+Shift+P"
-#: clientgui/AdvancedFrame.cpp:402
+#: clientgui/AdvancedFrame.cpp:405
msgid "Show projects"
msgstr "Monter les projets"
-#: clientgui/AdvancedFrame.cpp:407
+#: clientgui/AdvancedFrame.cpp:410
msgid "&Tasks\tCtrl+Shift+T"
msgstr "&Tâches\tCtrl+Shift+T"
-#: clientgui/AdvancedFrame.cpp:408
+#: clientgui/AdvancedFrame.cpp:411
msgid "Show tasks"
msgstr "Montrer les tâches"
-#: clientgui/AdvancedFrame.cpp:413
+#: clientgui/AdvancedFrame.cpp:416
msgid "Trans&fers\tCtrl+Shift+X"
msgstr "Trans&ferts\tCtrl+Shift+X"
-#: clientgui/AdvancedFrame.cpp:414
+#: clientgui/AdvancedFrame.cpp:417
msgid "Show file transfers"
msgstr "Montrer les transferts de fichiers "
-#: clientgui/AdvancedFrame.cpp:419
+#: clientgui/AdvancedFrame.cpp:422
msgid "&Statistics\tCtrl+Shift+S"
msgstr "&Statistiques\tCtrl+Shift+S"
-#: clientgui/AdvancedFrame.cpp:420
+#: clientgui/AdvancedFrame.cpp:423
msgid "Show statistics"
msgstr "Montrer les statistiques"
-#: clientgui/AdvancedFrame.cpp:425
+#: clientgui/AdvancedFrame.cpp:428
msgid "&Disk\tCtrl+Shift+D"
msgstr "&Disque⇥Ctrl+Shift+D"
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:429
msgid "Show disk usage"
msgstr "Montrer l'utilisation du disque"
-#: clientgui/AdvancedFrame.cpp:432
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Journal des évènements...\t Ctrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:433
-msgid "Show diagnostic messages"
-msgstr "Montrer les messages de diagnostic "
-
-#: clientgui/AdvancedFrame.cpp:439
+#: clientgui/AdvancedFrame.cpp:436
msgid "Simple &View...\tCtrl+Shift+V"
msgstr "&Vue Simple...\tCTRL+SHIFT+S"
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:437
msgid "Switch to the Simple View"
msgstr "Basculer en Vue Simplifié"
-#: clientgui/AdvancedFrame.cpp:454
-msgid "&Add project or account manager..."
-msgstr "&Rejoindre un projet ou un gestionnaire de compte..."
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
+msgstr "Ajouter un &projet..."
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "Ajouter un nouveau projet scientifique, ou utiliser un gestionnaire de compte"
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "Ajouter un projet"
-#: clientgui/AdvancedFrame.cpp:459
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "&Utiliser le gestionnaire de compte..."
+
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "Utilisez un gestionnaire de compte pour contrôler cet ordinateur."
+
+#: clientgui/AdvancedFrame.cpp:461
#, c-format
msgid "&Synchronize with %s"
msgstr "&Synchronisation avec %s"
-#: clientgui/AdvancedFrame.cpp:463
+#: clientgui/AdvancedFrame.cpp:465
#, c-format
msgid "Get current settings from %s"
msgstr "Récupération des paramètres actuels de %s "
-#: clientgui/AdvancedFrame.cpp:473
-msgid "&Add project..."
-msgstr "Ajouter un &projet..."
-
-#: clientgui/AdvancedFrame.cpp:474
-msgid "Add a project"
-msgstr "Ajouter un projet"
-
-#: clientgui/AdvancedFrame.cpp:477
+#: clientgui/AdvancedFrame.cpp:479
#, c-format
msgid "S&top using %s..."
msgstr "&Arrêter d'utiliser %s..."
-#: clientgui/AdvancedFrame.cpp:483
+#: clientgui/AdvancedFrame.cpp:485
msgid "Remove this computer from account manager control."
msgstr "Enlever cet ordinateur du contrôle du gestionnaire de compte."
-#: clientgui/AdvancedFrame.cpp:489
+#: clientgui/AdvancedFrame.cpp:491
msgid "Run CPU &benchmarks"
msgstr "Effectuer les &tests de puissance de votre CPU"
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:492
msgid "Run tests that measure CPU speed"
msgstr "Effectuer les tests mesurant la vitesse des processeurs"
-#: clientgui/AdvancedFrame.cpp:494
+#: clientgui/AdvancedFrame.cpp:496
msgid "Retry pending transfers"
msgstr "Réessayer les transferts en attente"
-#: clientgui/AdvancedFrame.cpp:495
+#: clientgui/AdvancedFrame.cpp:497
msgid "Retry deferred file transfers and task requests"
msgstr "Réessayer les transferts de fichiers et les taches différés "
+#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "Journal des évènements...\t Ctrl+Shift+E"
+
#: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr "Montrer les messages de diagnostic "
+
+#: clientgui/AdvancedFrame.cpp:511
msgid "&Run always"
msgstr "&Calculer en permanence"
-#: clientgui/AdvancedFrame.cpp:504
+#: clientgui/AdvancedFrame.cpp:512
msgid "Allow work regardless of preferences"
msgstr "Autorise le travail sans tenir compte des préférences"
-#: clientgui/AdvancedFrame.cpp:508
+#: clientgui/AdvancedFrame.cpp:516
msgid "Run based on &preferences"
msgstr "Calculer selon les &préférences"
-#: clientgui/AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:517
msgid "Allow work according to preferences"
msgstr "Autorise le travail selon les préférences"
-#: clientgui/AdvancedFrame.cpp:513
+#: clientgui/AdvancedFrame.cpp:521
msgid "&Suspend"
msgstr "&Suspendre"
-#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/AdvancedFrame.cpp:522
msgid "Stop work regardless of preferences"
msgstr "Arrêter les calculs sans tenir compte des préférences"
-#: clientgui/AdvancedFrame.cpp:539
+#: clientgui/AdvancedFrame.cpp:547
msgid "Use GPU always"
msgstr "Toujours utiliser le GPU"
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:548
msgid "Allow GPU work regardless of preferences"
msgstr "Autorise le calcul GPU sans tenir compte des préférences"
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:552
msgid "Use GPU based on preferences"
msgstr "Utiliser le GPU selon les préférences"
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:553
msgid "Allow GPU work according to preferences"
msgstr "Autoriser le calcul GPU selon les préférences"
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:557
msgid "Suspend GPU"
msgstr "Suspendre le GPU"
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:558
msgid "Stop GPU work regardless of preferences"
msgstr "Arrête les calculs du GPU sans tenir compte des préférences"
-#: clientgui/AdvancedFrame.cpp:574
+#: clientgui/AdvancedFrame.cpp:582
msgid "Network activity always allowed"
msgstr "Activité réseau autorisé en permanence"
-#: clientgui/AdvancedFrame.cpp:575
+#: clientgui/AdvancedFrame.cpp:583
msgid "Allow network activity regardless of preferences"
msgstr "Autoriser l'activité réseau sans tenir compte des préférences"
-#: clientgui/AdvancedFrame.cpp:579
+#: clientgui/AdvancedFrame.cpp:587
msgid "Network activity based on preferences"
msgstr "Activité réseau selon les préférences"
-#: clientgui/AdvancedFrame.cpp:580
+#: clientgui/AdvancedFrame.cpp:588
msgid "Allow network activity according to preferences"
msgstr "Autoriser l'activité réseau selon les préférences"
-#: clientgui/AdvancedFrame.cpp:584
+#: clientgui/AdvancedFrame.cpp:592
msgid "Network activity suspended"
msgstr "Activité réseau suspendue"
-#: clientgui/AdvancedFrame.cpp:585
+#: clientgui/AdvancedFrame.cpp:593
msgid "Stop BOINC network activity"
msgstr "Arrêter l'activité réseau de BOINC"
-#: clientgui/AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
msgid "Computing &preferences..."
msgstr "&Préférences de calcul..."
-#: clientgui/AdvancedFrame.cpp:595
+#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
msgid "Configure computing preferences"
msgstr "Configurer les préférences de calcul"
-#: clientgui/AdvancedFrame.cpp:600
+#: clientgui/AdvancedFrame.cpp:608
msgid "Exclusive applications..."
msgstr "Applications exclusive..."
-#: clientgui/AdvancedFrame.cpp:601
+#: clientgui/AdvancedFrame.cpp:609
msgid "Configure exclusive applications"
msgstr "Configurer les applications exclusives"
-#: clientgui/AdvancedFrame.cpp:606
+#: clientgui/AdvancedFrame.cpp:614
msgid "Select columns..."
msgstr "Sélectionnez les colonnes"
-#: clientgui/AdvancedFrame.cpp:607
+#: clientgui/AdvancedFrame.cpp:615
msgid "Select which columns to display"
msgstr "Sélectionnez les colonnes à montrer"
-#: clientgui/AdvancedFrame.cpp:611
+#: clientgui/AdvancedFrame.cpp:619
msgid "Event Log options...\tCtrl+Shift+F"
msgstr "Options du Journal des événements... Ctrl+Shift+F"
-#: clientgui/AdvancedFrame.cpp:612
+#: clientgui/AdvancedFrame.cpp:620
msgid "Enable or disable various diagnostic messages"
msgstr "Activer ou désactiver les messages de diagnostic divers"
-#: clientgui/AdvancedFrame.cpp:616
+#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
msgid "&Other options..."
msgstr "& Autres options..."
-#: clientgui/AdvancedFrame.cpp:617
+#: clientgui/AdvancedFrame.cpp:625
msgid "Configure display options and network settings"
msgstr "Configuration des options d'affichage et des paramètres réseaux"
-#: clientgui/AdvancedFrame.cpp:622
+#: clientgui/AdvancedFrame.cpp:630
msgid "Read config files"
msgstr "Lire les fichiers de configuration"
-#: clientgui/AdvancedFrame.cpp:623
+#: clientgui/AdvancedFrame.cpp:631
msgid ""
"Read configuration info from cc_config.xml and any app_config.xml files"
msgstr "Lire les informations de configuration du fichier cc_config.xml et de tout fichier app_config.xml"
-#: clientgui/AdvancedFrame.cpp:627
+#: clientgui/AdvancedFrame.cpp:635
msgid "Read local prefs file"
msgstr "Lire le fichier de préférences locales"
-#: clientgui/AdvancedFrame.cpp:628
+#: clientgui/AdvancedFrame.cpp:636
msgid "Read preferences from global_prefs_override.xml."
msgstr "Lit les préférences contenues dans le fichier global_prefs_override.xml."
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
#, c-format
msgid "%s &help"
msgstr "&Aide sur %s"
-#: clientgui/AdvancedFrame.cpp:640
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
#, c-format
msgid "Show information about %s"
msgstr "Affiche les informations à propos de %s"
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:658
#, c-format
msgid "&%s help"
msgstr "&Aide sur le %s"
-#: clientgui/AdvancedFrame.cpp:654
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
#, c-format
msgid "Show information about the %s"
msgstr "Affiche les informations à propos du %s"
-#: clientgui/AdvancedFrame.cpp:665
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
#, c-format
msgid "%s &web site"
msgstr "Site web de %s"
-#: clientgui/AdvancedFrame.cpp:669
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
#, c-format
msgid "Show information about BOINC and %s"
msgstr "Affiche les informations à propos de BOINC et %s"
-#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:688 clientgui/BOINCTaskBar.cpp:544
+#: clientgui/sg_BoincSimpleFrame.cpp:262
#, c-format
msgid "&About %s..."
msgstr "&A propos de %s..."
-#: clientgui/AdvancedFrame.cpp:686
+#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
msgid "Licensing and copyright information."
msgstr "Informations sur les droits d'auteur et la licence."
-#: clientgui/AdvancedFrame.cpp:693
+#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
msgid "&File"
msgstr "&Fichier"
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
msgid "&View"
msgstr "&Affichage"
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:709
msgid "&Activity"
msgstr "&Activité"
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
msgid "&Options"
msgstr "&Options..."
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
msgid "&Tools"
msgstr "&Outils"
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
msgid "&Help"
msgstr "&Aide"
-#: clientgui/AdvancedFrame.cpp:1188
+#: clientgui/AdvancedFrame.cpp:1235
#, c-format
msgid "%s - Stop using %s"
msgstr "%s - Arrêter d'utiliser %s"
-#: clientgui/AdvancedFrame.cpp:1193
+#: clientgui/AdvancedFrame.cpp:1240
#, c-format
msgid ""
"If you stop using %s,\n"
@@ -573,39 +581,39 @@ msgid ""
"Do you want to stop using %s?"
msgstr "Si vous cessez d'utiliser %s, \nvous conserverez tous vos projets \nmais vous devrez les gérer manuellement.\nVoulez-vous cesser d'utiliser %s ?"
-#: clientgui/AdvancedFrame.cpp:1420
+#: clientgui/AdvancedFrame.cpp:1469
#, c-format
msgid "%s - Shut down the current client..."
msgstr "%s - Arrêter le client actuel..."
-#: clientgui/AdvancedFrame.cpp:1429
+#: clientgui/AdvancedFrame.cpp:1478
#, c-format
msgid ""
"%s will shut down the current client\n"
"and prompt you for another host to connect to."
msgstr "%s arrêtera le client connecté\net vous invitera à vous connecter à un autre ordinateur."
-#: clientgui/AdvancedFrame.cpp:1832
+#: clientgui/AdvancedFrame.cpp:1881 clientgui/DlgAbout.cpp:119
#, c-format
msgid "%s"
msgstr "%s"
-#: clientgui/AdvancedFrame.cpp:1841
+#: clientgui/AdvancedFrame.cpp:1890
#, c-format
msgid "%s has successfully added %s"
msgstr "%s a ajouté avec succès %s"
-#: clientgui/AdvancedFrame.cpp:1977
+#: clientgui/AdvancedFrame.cpp:2026
#, c-format
msgid "%s - (%s)"
msgstr "%s - (%s)"
-#: clientgui/AdvancedFrame.cpp:1981
+#: clientgui/AdvancedFrame.cpp:2030
#, c-format
msgid "Connecting to %s"
msgstr "Connexion à %s en cours"
-#: clientgui/AdvancedFrame.cpp:1984
+#: clientgui/AdvancedFrame.cpp:2033
#, c-format
msgid "Connected to %s (%s)"
msgstr "Connecté à %s (%s)"
@@ -653,7 +661,15 @@ msgstr "&Fermer %s"
msgid "%s - Communication"
msgstr "%s - Communication"
-#: clientgui/AsyncRPC.cpp:1056
+#. m_btnClear = new wxButton( this, ID_SGPREFERENCESCLEAR, _("Clear"),
+#. wxDefaultPosition, wxDefaultSize, 0 );
+#. m_btnClear->SetToolTip( _("Clear all local preferences listed above and
+#. close the dialog") );
+#. itemBoxSizer44->Add(m_btnClear, 0, wxALIGN_CENTER_VERTICAL|wxALL,
+#. ADJUSTFORXDPI(5));
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:361
msgid "Cancel"
msgstr "Annuler"
@@ -726,6 +742,7 @@ msgid ""
"To connect up to your local computer please use 'localhost' as the host name."
msgstr "%s n'est actuellement pas connecté à un client %s.\nVeuillez utiliser l'option du menu 'Avancé\\Sélectionner un ordinateur...' pour vous connecter à un client %s.\nPour vous connecter à votre ordinateur local, veuillez utiliser 'localhost' comme nom d'hôte."
+#. Create the web sites task group
#: clientgui/BOINCBaseView.cpp:790
msgid "Project web pages"
msgstr "Pages Web du projet"
@@ -810,7 +827,8 @@ msgstr "Les autorisations des fichiers %s ne sont pas paramétrées correctement
msgid " at "
msgstr " chez "
-#: clientgui/BOINCGUIApp.cpp:612
+#: clientgui/BOINCGUIApp.cpp:612 clientgui/MainDocument.cpp:2494
+#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
msgid ")"
msgstr ")"
@@ -820,7 +838,7 @@ msgid ""
"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:643
+#: clientgui/BOINCGUIApp.cpp:643 clientgui/DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "Manager BOINC"
@@ -872,6 +890,7 @@ msgstr "instances multiples du gestionnaire BOINC autorisées"
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "Non utilisé: contournement du bogue dans XCode 4.2"
+#. These are just special tags so deal with them in a special way
#: clientgui/BOINCGUIApp.cpp:1166
msgid "(Automatic Detection)"
msgstr "(Détection automatique)"
@@ -894,13 +913,13 @@ msgstr "Ouvre le site web de %s..."
msgid "Open %s..."
msgstr "Ouvrir %s..."
-#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:634
+#: clientgui/BOINCTaskBar.cpp:639
msgid "Snooze"
msgstr "Mettre en veille"
-#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:658
msgid "Snooze GPU"
msgstr "Mettre en veille le GPU"
@@ -908,52 +927,55 @@ msgstr "Mettre en veille le GPU"
msgid "E&xit"
msgstr "&Quitter"
-#: clientgui/BOINCTaskBar.cpp:626
+#: clientgui/BOINCTaskBar.cpp:629 clientgui/ViewProjects.cpp:798
+#: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
+#: clientgui/sg_ProjectCommandPopup.cpp:125
+#: clientgui/sg_TaskCommandPopup.cpp:118
msgid "Resume"
msgstr "Reprendre"
-#: clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:649
msgid "Resume GPU"
msgstr "Reprendre l'activité GPU"
-#: clientgui/BOINCTaskBar.cpp:727
+#: clientgui/BOINCTaskBar.cpp:715
msgid "Computing is enabled"
msgstr "Le calcul est autorisé"
-#: clientgui/BOINCTaskBar.cpp:731
+#: clientgui/BOINCTaskBar.cpp:719
msgid "Computing is suspended - "
msgstr "Le calcul est suspendu - "
-#: clientgui/BOINCTaskBar.cpp:741
+#: clientgui/BOINCTaskBar.cpp:729
msgid "GPU computing is enabled"
msgstr "Le calcul sur GPU est autorisé"
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:732
msgid "GPU computing is suspended - "
msgstr "Le calcul sur GPU est suspendu - "
-#: clientgui/BOINCTaskBar.cpp:753
+#: clientgui/BOINCTaskBar.cpp:741
msgid "Network is enabled"
msgstr "Utilisation du réseau autorisée"
-#: clientgui/BOINCTaskBar.cpp:756
+#: clientgui/BOINCTaskBar.cpp:744
msgid "Network is suspended - "
msgstr "Activité réseau suspendue - "
-#: clientgui/BOINCTaskBar.cpp:764
+#: clientgui/BOINCTaskBar.cpp:752
msgid "Reconnecting to client."
msgstr "En cours de reconnexion au client."
-#: clientgui/BOINCTaskBar.cpp:766
+#: clientgui/BOINCTaskBar.cpp:754
msgid "Not connected to a client."
msgstr "Aucune connexion à un client."
-#: clientgui/BOINCTaskBar.cpp:819
+#: clientgui/BOINCTaskBar.cpp:807
#, c-format
msgid "%s Notices"
msgstr "Notifications de %s"
-#: clientgui/BOINCTaskBar.cpp:825
+#: clientgui/BOINCTaskBar.cpp:813
msgid "There are new notices - click to view."
msgstr "Il y a de nouveaux messages - cliquer pour visualiser."
@@ -1012,6 +1034,7 @@ msgstr "Mise à jour de %s terminée"
msgid "Update completed."
msgstr "Mise à jour effectuée."
+#. Attach Completed
#: clientgui/CompletionPage.cpp:247
msgid "Now using account manager"
msgstr "Vous utilisez actuellement un gestionnaire de comptes"
@@ -1071,35 +1094,39 @@ msgstr "Pour plus d'informations."
msgid "&OK"
msgstr "&OK"
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:779
msgid "Invalid number"
msgstr "nombre invalide"
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:780
msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
msgstr "Horaire incorrect, la valeur doit être comprise entre 00:00 et 24:00, au format HH:MM"
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:781
+msgid "Start time must be different from end time"
+msgstr "L'heure de début doit être différente de l'heure de fin"
+
+#: clientgui/DlgAdvPreferences.cpp:685
msgid "Number must be between 0 and 10"
msgstr "Le nombre doit être compris entre 0 et 10"
-#: clientgui/DlgAdvPreferences.cpp:672
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:782
msgid "Number must be between 0 and 100"
msgstr "Le nombre doit être compris entre 0 et 100"
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:853
msgid "invalid input value detected"
msgstr "valeur invalide détectée"
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:855
msgid "Validation Error"
msgstr "Erreur de Validation"
-#: clientgui/DlgAdvPreferences.cpp:1119
+#: clientgui/DlgAdvPreferences.cpp:1158
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:1120
+#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1181
msgid "Confirmation"
msgstr "Confirmation"
@@ -1108,106 +1135,112 @@ msgstr "Confirmation"
msgid "%s - Computing preferences"
msgstr "%s - Préférence de calcul"
-#: clientgui/DlgAdvPreferencesBase.cpp:77
+#: clientgui/DlgAdvPreferencesBase.cpp:82 clientgui/sg_DlgPreferences.cpp:161
msgid ""
"Using local preferences.\n"
"Click \"Use web prefs\" to use web-based preferences from"
msgstr "Utilisation des préférences locales.\nCliquez sur « Utiliser les préférences web » pour utiliser les préférences enregistrées sur le web"
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
msgid "Using web-based preferences from"
msgstr "Utilisation des préférences enregistrées sur le web"
-#: clientgui/DlgAdvPreferencesBase.cpp:102
+#: clientgui/DlgAdvPreferencesBase.cpp:107 clientgui/sg_DlgPreferences.cpp:187
msgid "Set values and click OK to use local preferences instead."
msgstr "Renseignez une valeur et cliquez sur OK pour plutôt utiliser les préférences locales."
-#: clientgui/DlgAdvPreferencesBase.cpp:111
+#: 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 "Cette fenêtre contrôle les préférences pour cet ordinateur uniquement.\nCliquez sur OK pour enregistrer ces préférences.\nCliquez sur Effacer pour restaurer les paramètres du site internet (sauf les applications exclusives)."
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: clientgui/DlgAdvPreferencesBase.cpp:119
msgid "Clear"
msgstr "Supprimer"
-#: clientgui/DlgAdvPreferencesBase.cpp:115
+#: clientgui/DlgAdvPreferencesBase.cpp:120
msgid "Clear all local preferences and close the dialog."
msgstr "Effacer toutes les préférences locales et fermer la fenêtre"
-#: clientgui/DlgAdvPreferencesBase.cpp:118
+#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:216
msgid "Use web prefs"
msgstr "Utiliser les préférences web"
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:217
msgid "Restore web-based preferences and close the dialog."
msgstr "Restaurer les préférences enregistrées sur le web et fermer la fenêtre."
-#: clientgui/DlgAdvPreferencesBase.cpp:143
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#. Computing schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:148
+#: clientgui/DlgAdvPreferencesBase.cpp:643
msgid "Computing"
msgstr "Calculs en cours"
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:791
msgid "Network"
msgstr "Utilisation du réseau"
-#: clientgui/DlgAdvPreferencesBase.cpp:149
+#: clientgui/DlgAdvPreferencesBase.cpp:154
msgid "Disk and memory"
msgstr "Disque et mémoire"
-#: clientgui/DlgAdvPreferencesBase.cpp:152
+#: clientgui/DlgAdvPreferencesBase.cpp:157
msgid "Daily schedules"
msgstr "Planifications journalières"
-#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgAdvPreferencesBase.cpp:170
#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
-#: clientgui/DlgHiddenColumns.cpp:100
+#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:352
msgid "OK"
msgstr "OK"
-#: clientgui/DlgAdvPreferencesBase.cpp:166
+#: clientgui/DlgAdvPreferencesBase.cpp:171
msgid "Save all values and close the dialog."
msgstr "Enregistrer toutes les préférences et fermer la fenêtre."
-#: clientgui/DlgAdvPreferencesBase.cpp:172
+#: clientgui/DlgAdvPreferencesBase.cpp:177
msgid "Close the dialog without saving."
msgstr "Fermer la fenêtre sans enregistrer les changements."
-#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+#: clientgui/DlgAdvPreferencesBase.cpp:181 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:367
msgid "Help"
msgstr "Aide"
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:182
msgid "Shows the preferences web page."
msgstr "Afficher la page web des préférences."
-#: clientgui/DlgAdvPreferencesBase.cpp:239
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:431
msgid "Usage limits"
msgstr "Les limites d'utilisation"
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#. Test Comment
+#: clientgui/DlgAdvPreferencesBase.cpp:250
#, no-c-format
msgid ""
"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
"on an 8-core CPU."
msgstr "Garder certains processeurs libres pour d'autres applications. Exemple : 75 % signifie utiliser 6 cœurs sur un processeur 8-core."
-#: clientgui/DlgAdvPreferencesBase.cpp:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: clientgui/DlgAdvPreferencesBase.cpp:264 clientgui/sg_DlgPreferences.cpp:307
msgid "Use at most"
msgstr "Utiliser au plus"
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:257
#, no-c-format
msgid "% of the CPUs"
msgstr "% du temps CPU"
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:262 clientgui/sg_DlgPreferences.cpp:305
#, no-c-format
msgid ""
"Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1215,342 +1248,345 @@ msgid ""
"and repeat."
msgstr "Suspend puis reprend les calculs toutes les quelques secondes afin de réduire la température du processeur et la consommation d'énergie. Exemple : 75 % signifie calculer pendant 3 secondes, attendre 1 seconde et répéter."
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:269 clientgui/sg_DlgPreferences.cpp:312
#, no-c-format
msgid "% of CPU time"
msgstr "% du temps CPU"
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:276
msgid "When to suspend"
msgstr "Quand suspendre les calculs"
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:282 clientgui/sg_DlgPreferences.cpp:242
msgid "Suspend when computer is on battery"
msgstr "Suspension quand l'ordinateur est sur batterie"
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:285 clientgui/sg_DlgPreferences.cpp:238
msgid ""
"Check this to suspend computing on portables when running on battery power."
msgstr "Cochez cette case pour suspendre les calculs sur votre portable quand il fonctionne sur batterie."
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:291 clientgui/sg_DlgPreferences.cpp:256
msgid "Suspend when computer is in use"
msgstr "Suspendre les calculs lorsque l'ordinateur est utilisé"
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:294 clientgui/sg_DlgPreferences.cpp:252
msgid ""
"Check this to suspend computing and file transfers when you're using the "
"computer."
msgstr "Cochez cette case pour suspendre le calcul et les transferts de fichiers lorsque vous utilisez l'ordinateur."
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:300
msgid "Suspend GPU computing when computer is in use"
msgstr "Suspendre le calcul par la carte graphique lorsque l'ordinateur est utilisé"
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:303
msgid "Check this to suspend GPU computing when you're using the computer."
msgstr "Cochez cette case pour suspendre le calcul par la carte graphique lorsque vous utilisez l'ordinateur."
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:308 clientgui/sg_DlgPreferences.cpp:267
msgid "This determines when the computer is considered 'in use'."
msgstr "Ceci permet de déterminer quand l'ordinateur est considéré comme \"en usage\"."
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:271
msgid "'In use' means mouse/keyboard input in last"
msgstr "'Est utilisé' signifie qu'il y a eu une activité de la souris ou du clavier dans les dernières"
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#: clientgui/DlgAdvPreferencesBase.cpp:320
+#: clientgui/DlgAdvPreferencesBase.cpp:393 clientgui/sg_DlgPreferences.cpp:279
msgid "minutes"
msgstr "minutes"
-#: clientgui/DlgAdvPreferencesBase.cpp:321
+#: clientgui/DlgAdvPreferencesBase.cpp:327
#, c-format
msgid "Suspend when non-%s CPU usage is above"
msgstr "Suspendre lorsque l'utilisation du processeur est au-dessus de"
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:329
msgid "Suspend computing when your computer is busy running other programs."
msgstr "Suspendre le calcul lorsque votre ordinateur est occupé à exécuter d'autres programmes."
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#: clientgui/DlgAdvPreferencesBase.cpp:350
+#: clientgui/DlgAdvPreferencesBase.cpp:480
msgid "Other"
msgstr "Autre"
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:355
msgid "Store at least enough tasks to keep the computer busy for this long."
msgstr "Stocker au moins assez de tâches pour occuper l'ordinateur pendant cette durée."
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: clientgui/DlgAdvPreferencesBase.cpp:358
msgid "Store at least"
msgstr "Stocker au moins"
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#: clientgui/DlgAdvPreferencesBase.cpp:366
+#: clientgui/DlgAdvPreferencesBase.cpp:382
msgid "days of work"
msgstr "jours de travail"
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:371
msgid ""
"Store additional tasks above the minimum level. Determines how much work is"
" requested when contacting a project."
msgstr "Stocker des tâches supplémentaires au-dessus du niveau minimum. Détermine la quantité de travail demandée lorsque vous communiquez avec un projet."
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#: clientgui/DlgAdvPreferencesBase.cpp:374
msgid "Store up to an additional"
msgstr "Stocker jusqu'à un additionnel"
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:387
#, c-format
msgid "If you run several projects, %s may switch between them this often."
msgstr "Si vous exécutez plusieurs projets, %s peut basculer entre eux souvent."
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#: clientgui/DlgAdvPreferencesBase.cpp:389
msgid "Switch between tasks every"
msgstr "Permuter entre les tâches toutes les"
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:397
msgid ""
"This controls how often tasks save their state to disk, so that they can be "
"restarted later."
msgstr "Ce paramètre règle le nombre de fois que les tâches peuvent enregistrer leur état sur le disque, afin qu'elles puissent être redémarrées plus tard."
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#: clientgui/DlgAdvPreferencesBase.cpp:398
msgid "Request tasks to checkpoint at most every"
msgstr "Demander des tâches au point de contrôle au plus chaque"
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#: clientgui/DlgAdvPreferencesBase.cpp:402
msgid "seconds"
msgstr "secondes"
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:437
msgid "Limit the download rate of file transfers."
msgstr "Limiter le taux de transfert de fichiers descendant (download)."
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:438
msgid "Limit download rate to"
msgstr "Taux limite de téléchargement descendant"
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:442
+#: clientgui/DlgAdvPreferencesBase.cpp:451
msgid "KB/second"
msgstr "KB/seconde"
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:446
msgid "Limit the upload rate of file transfers."
msgstr "Limiter le taux de transferts de fichiers ascendant (upload)."
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:447
msgid "Limit upload rate to"
msgstr "Taux limite de téléchargement ascendant"
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:458
#, c-format
msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
msgstr "Exemple : %s doit transférer au maximum 2000 MB de données tous les 30 jours."
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:460
msgid "Limit usage to"
msgstr "Limiter à"
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:464
msgid "MB every"
msgstr "MB chaque"
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:468
msgid "days"
msgstr "jours"
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:485
#, c-format
msgid ""
"Check this only if your Internet provider modifies image files. Skipping "
"verification reduces the security of %s."
msgstr "Cochez si votre fournisseur d'accès Internet modifie les fichiers image.\nIgnorer cette vérification réduit la sécurité de %s"
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:487
msgid "Skip data verification for image files"
msgstr "Ignorer la vérification des données pour les fichiers image"
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:491
msgid "Confirm before connecting to Internet"
msgstr "Confirmer avant de se connecter à internet"
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:492
+#: clientgui/DlgAdvPreferencesBase.cpp:496
msgid "Useful only if you have a modem, ISDN or VPN connection."
msgstr "Utiliser uniquement si vous avez un modem, la connexion VPN ou RNIS."
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:495
msgid "Disconnect when done"
msgstr "Se déconnecter dès que terminé"
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:522 clientgui/ViewResources.cpp:116
msgid "Disk"
msgstr "Disque"
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:527
#, c-format
msgid "%s will use the most restrictive of these settings:"
msgstr "%s utilisera le plus restrictif de ces paramètres :"
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:533 clientgui/sg_DlgPreferences.cpp:334
#, c-format
msgid "Limit the total amount of disk space used by %s."
msgstr "Limiter la quantité totale d'espace disque utilisée par %s."
-#: clientgui/DlgAdvPreferencesBase.cpp:530
-#: clientgui/DlgAdvPreferencesBase.cpp:554
+#: clientgui/DlgAdvPreferencesBase.cpp:536
+#: clientgui/DlgAdvPreferencesBase.cpp:560 clientgui/sg_DlgPreferences.cpp:337
msgid "Use no more than"
msgstr "Ne pas utiliser plus de:"
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:540
msgid "GB"
msgstr "Go"
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:545
#, c-format
msgid ""
"Limit disk usage to leave this much free space on the volume where %s stores"
" data."
msgstr "Limiter l'utilisation du disque dur afin de laisser suffisamment d'espace libre sur le volume où %s stocke les données."
-#: clientgui/DlgAdvPreferencesBase.cpp:542
+#: clientgui/DlgAdvPreferencesBase.cpp:548
msgid "Leave at least"
msgstr "Laisser au moins"
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:552
msgid "GB free"
msgstr "GB libre"
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:557
#, c-format
msgid ""
"Limit the percentage of disk space used by %s on the volume where it stores "
"data."
msgstr "Limiter le pourcentage d'espace disque utilisée par %s sur le volume où il stocke les données."
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: clientgui/DlgAdvPreferencesBase.cpp:565
#, no-c-format
msgid "% of total"
msgstr "% du total"
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:572
msgid "Memory"
msgstr "Mémoire"
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:577
#, c-format
msgid "Limit the memory used by %s when you're using the computer."
msgstr "Limiter la mémoire utilisée par %s lorsque vous utilisez l'ordinateur."
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:579
msgid "When computer is in use, use at most"
msgstr "Lorsque l'ordinateur est utilisé, utilisez au maximum"
-#: clientgui/DlgAdvPreferencesBase.cpp:579
-#: clientgui/DlgAdvPreferencesBase.cpp:591
-#: clientgui/DlgAdvPreferencesBase.cpp:607
+#: clientgui/DlgAdvPreferencesBase.cpp:585
+#: clientgui/DlgAdvPreferencesBase.cpp:597
+#: clientgui/DlgAdvPreferencesBase.cpp:613
#, no-c-format
msgid "%"
msgstr "%"
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:590
#, c-format
msgid "Limit the memory used by %s when you're not using the computer."
msgstr "Limiter la mémoire utilisée par %s lorsque vous n'utilisez pas l'ordinateur."
-#: clientgui/DlgAdvPreferencesBase.cpp:586
+#: clientgui/DlgAdvPreferencesBase.cpp:592
msgid "When computer is not in use, use at most"
msgstr "Lorsque l'ordinateur n'est pas en utilisation, utiliser au maximum"
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:601
msgid "Leave non-GPU tasks in memory while suspended"
msgstr "Laisser les tâches non-GPU en mémoire lorsqu'elles sont suspendues"
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:602
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 "Si coché, les tâches seront gardées en mémoire pour pouvoir reprendre le travail sans perte. Si non coché, les tâches suspendues seront supprimées de la mémoire, et la reprise s'effectuera depuis leur dernier point de contrôle."
-#: clientgui/DlgAdvPreferencesBase.cpp:600
+#: clientgui/DlgAdvPreferencesBase.cpp:606
#, c-format
msgid "Limit the swap space (page file) used by %s."
msgstr "Limiter l'espace d'échange utilisé par %s (pagefile.sys ou swap)."
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:608
msgid "Page/swap file: use at most"
msgstr "Espace d'échange (swap) : utiliser au plus"
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:633 clientgui/sg_DlgPreferences.cpp:284
msgid "and"
msgstr "et"
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:634
msgid "to"
msgstr "à"
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:647 clientgui/sg_DlgPreferences.cpp:286
msgid "Compute only during a particular period each day."
msgstr "Autoriser les calculs seulement durant une certaine période chaque jour."
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:650 clientgui/sg_DlgPreferences.cpp:289
msgid "Compute only between"
msgstr "Réaliser des calculs seulement entre"
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:660
+#: clientgui/DlgAdvPreferencesBase.cpp:807
msgid "Day-of-week override"
msgstr "Restreindre sur les jours de la semaine:"
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:664
+#: clientgui/DlgAdvPreferencesBase.cpp:811
msgid "Override the times above on the selected days:"
msgstr "Appliquer la restriction d'horaire sur les jours sélectionnés :"
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:682
+#: clientgui/DlgAdvPreferencesBase.cpp:828
msgid "Monday"
msgstr "Lundi"
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:697
+#: clientgui/DlgAdvPreferencesBase.cpp:843
msgid "Friday"
msgstr "Vendredi"
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:710
+#: clientgui/DlgAdvPreferencesBase.cpp:856
msgid "Tuesday"
msgstr "Mardi"
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:725
+#: clientgui/DlgAdvPreferencesBase.cpp:871
msgid "Saturday"
msgstr "Samedi"
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: clientgui/DlgAdvPreferencesBase.cpp:884
msgid "Wednesday"
msgstr "Mercredi"
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:753
+#: clientgui/DlgAdvPreferencesBase.cpp:899
msgid "Sunday"
msgstr "Dimanche"
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:766
+#: clientgui/DlgAdvPreferencesBase.cpp:912
msgid "Thursday"
msgstr "Jeudi"
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:795 clientgui/sg_DlgPreferences.cpp:316
msgid "Transfer files only during a particular period each day."
msgstr "Transférer des fichiers uniquement pendant une période donnée chaque jour."
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:797 clientgui/sg_DlgPreferences.cpp:318
msgid "Transfer files only between"
msgstr "Transférer des fichiers seulement entre"
@@ -1589,15 +1625,19 @@ msgstr "Fermer la fenêtre sans sauvegarder"
msgid "%s - Event Log"
msgstr "%s - Journal des événements"
-#: clientgui/DlgEventLog.cpp:237
+#. Create List Pane Items
+#: clientgui/DlgEventLog.cpp:237 clientgui/ViewMessages.cpp:117
+#: clientgui/ViewProjects.cpp:245 clientgui/ViewStatistics.cpp:411
+#: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
+#: clientgui/ViewWork.cpp:260
msgid "Project"
msgstr "Projet"
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
msgid "Time"
msgstr "Date"
-#: clientgui/DlgEventLog.cpp:239
+#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
msgid "Message"
msgstr "Message"
@@ -1610,6 +1650,7 @@ msgid "Copy &All"
msgstr "Tout copier"
#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
msgid "Copy all the messages to the clipboard."
msgstr "Copie tous les messages dans le presse-papiers"
@@ -1618,6 +1659,7 @@ msgid "Copy &Selected"
msgstr "Copier la sélection"
#: clientgui/DlgEventLog.cpp:319 clientgui/DlgEventLog.cpp:327
+#: clientgui/ViewMessages.cpp:97
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or command key while clicking on "
@@ -1625,6 +1667,7 @@ msgid ""
msgstr "Copie les messages sélectionnés dans le presse-papiers. Vous pouvez sélectionner plusieurs messages en maintenant appuyée la touche Shift ou Ctrl lorsque vous cliquez sur les messages."
#: clientgui/DlgEventLog.cpp:321 clientgui/DlgEventLog.cpp:329
+#: clientgui/ViewMessages.cpp:99
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or control key while clicking on "
@@ -1666,6 +1709,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:224 clientgui/sg_ProjectCommandPopup.cpp:90
msgid "Remove"
msgstr "Retirer"
@@ -1693,6 +1737,8 @@ msgstr "fermer la fenêtre sans sauvegarder"
msgid "shows the preferences web page"
msgstr "affiche la page web des préférences"
+#. TODO: fill in the default directory for MSW
+#. TODO: fill in the default directory for Linux
#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
#: clientgui/DlgExclusiveApps.cpp:315
msgid "Applications to add"
@@ -1764,6 +1810,7 @@ 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/wizardex.cpp:378
msgid "&Cancel"
msgstr "&Annuler"
@@ -1820,10 +1867,12 @@ msgstr "Demande de travail différée de"
msgid " work fetch deferral interval"
msgstr "Intervalle d'ajournement de demande de travail"
+#. set dialog title
#: clientgui/DlgItemProperties.cpp:239
msgid "Properties of project "
msgstr "Propriétés du projet "
+#. layout controls
#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
msgid "General"
msgstr "Général"
@@ -1840,7 +1889,7 @@ msgstr "Nom d'utilisateur"
msgid "Team name"
msgstr "Nom de l'équipe"
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
msgid "Resource share"
msgstr "Partage des ressources"
@@ -1955,11 +2004,11 @@ msgstr "Facteur de correction de durée"
msgid "Properties of task "
msgstr "Propriétés de la tâche "
-#: clientgui/DlgItemProperties.cpp:357
+#: clientgui/DlgItemProperties.cpp:357 clientgui/ViewWork.cpp:266
msgid "Application"
msgstr "Application"
-#: clientgui/DlgItemProperties.cpp:358
+#: clientgui/DlgItemProperties.cpp:358 clientgui/ViewWork.cpp:267
msgid "Name"
msgstr "Nom"
@@ -2019,7 +2068,8 @@ msgstr "Répertoire"
msgid "Process ID"
msgstr "ID du process"
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
msgid "Local: "
msgstr "Local:"
@@ -2092,6 +2142,7 @@ msgid "Address:"
msgstr "Adresse:"
#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
msgid "Port:"
msgstr "Port:"
@@ -2104,11 +2155,13 @@ msgid "Leave these blank if not needed"
msgstr "Laisser vide si non nécessaire"
#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
msgid "User Name:"
msgstr "Nom d'utilisateur:"
#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
+#: clientgui/ProxyPage.cpp:366
msgid "Password:"
msgstr "Mot de passe:"
@@ -2303,6 +2356,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:247 clientgui/ViewStatistics.cpp:441
msgid "Team"
msgstr "Equipe"
@@ -2468,6 +2522,8 @@ msgstr "Projet suspendu par l'utilisateur"
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
#: clientgui/MainDocument.cpp:2507
msgid "Suspended - "
msgstr "Suspendu - "
@@ -2624,7 +2680,7 @@ msgstr "Pour choisir un projet, cliquez sur son nom ou tapez son URL ci-dessous.
msgid "Categories:"
msgstr "Catégories:"
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
msgid "Projects:"
msgstr "Projets:"
@@ -2783,380 +2839,6 @@ msgstr "Détection automatique"
msgid "SOCKS proxy"
msgstr "Proxy SOCKS"
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "Apparence"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "Choisissez l'apparence de l'interface utilisateur."
-
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "Afficher les messages de diagnostique."
-
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Vue Avancée\tCTRL+SHIFT+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "Afficher l'interface graphique avancée."
-
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "Configuration des options d'affichage et des paramètres de proxy"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "Valeur par défaut"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "Suspendre"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "Suspendre le calcul"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "Reprendre le calcul"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "Remarques"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Ouvrir une fenêtre pour voir les messages des projets ou de BOINC"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "Obtenir de l'aide avec %s"
-
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Recherche d'avis; patientez s'il-vous-plaît..."
-
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Il n'y a pas de nouveaux messages."
-
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Fermer"
-
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "Notifications de %s"
-
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Pour des réglages supplémentaires, choisissez Préférences de Calcul dans la vue Avancée."
-
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "Go d'espace disque"
-
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Préférences de calcul"
-
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all 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/sg_ProjectCommandPopup.cpp:66
-msgid "Update"
-msgstr "Mettre à jour"
-
-#: 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/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-msgid "Suspend tasks for this project."
-msgstr "Suspend le travail de ce projet."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-msgid "No new tasks"
-msgstr "Pas de nouveau travail"
-
-#: 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/sg_ProjectCommandPopup.cpp:84
-msgid "Reset project"
-msgstr "Recommencer le projet"
-
-#: 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/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/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-msgid "Properties"
-msgstr "Propriétés"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-msgid "Show project details."
-msgstr "Afficher les détails du projet."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr "Reprend le travail pour ce projet."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "Autoriser du nouveau travail"
-
-#: 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/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/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/sg_ProjectCommandPopup.cpp:235
-msgid "Reset Project"
-msgstr "Recommencer le projet"
-
-#: 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/sg_ProjectCommandPopup.cpp:272
-msgid "Remove Project"
-msgstr "Supprimer le projet"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Ajouter un projet"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Synchroniser"
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Travail terminé pour ce projet"
-
-#: clientgui/sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Volontaire pour tout projet parmi la trentaine disponibles dans de nombreux domaines de sciences"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Synchroniser les projets avec le gestionnaire de compte"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Choisir un projet à accéder avec les contrôles ci-dessous"
-
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Sites Web du projet"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Commandes du projet"
-
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Afficher une liste des sites web pour le projet %s"
-
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Afficher une liste des commandes à appliquer au projet %s"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Montrer les graphiques"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Montre les graphiques de l'application dans une fenêtre."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Suspendre cette tâche."
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Abandonner"
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Abandonner cette tâche. Vous ne recevrez pas de point(crédit) pour cette tâche."
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Afficher les détails de la tâche."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Reprendre le calcul de cette unité."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Suspendre le calcul de cette unité."
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr "Êtes-vous sûr de vouloir abandonner cette tâche '%s'?\n(Avancement: %.1lf%%, État: %s)"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Abandonner la tâche"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects. Please Add a Project."
-msgstr "Vous n'avez aucun projet. Veuillez Ajouter un projet."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Non disponible"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Tâches:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Choisir une tâche"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "De:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Avancement de cette tâche"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Commandes de tâche"
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Afficher une liste des commandes applicables à cette tâche"
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Application: %s"
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Application: Non disponible"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Non disponible"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Écoulé: %s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Restant (estimation): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Statut: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1228
-msgid "Retrieving current status."
-msgstr "Recherche de l'état actuel"
-
-#: clientgui/sg_TaskPanel.cpp:1234
-msgid "Downloading work from the server."
-msgstr "Téléchargement du travail depuis le serveur en cours"
-
-#: clientgui/sg_TaskPanel.cpp:1239
-msgid "Processing Suspended: Running On Batteries."
-msgstr "Traitement Suspendu: Fonctionne sur Batteries."
-
-#: clientgui/sg_TaskPanel.cpp:1241
-msgid "Processing Suspended: User Active."
-msgstr "Traitement Suspendu: Utilisateur Actif"
-
-#: clientgui/sg_TaskPanel.cpp:1243
-msgid "Processing Suspended: User paused processing."
-msgstr "Traitement Suspendu: L'utilisateur a mis en pause le traitement."
-
-#: clientgui/sg_TaskPanel.cpp:1245
-msgid "Processing Suspended: Time of Day."
-msgstr "Traitement Suspendu: Moment de la Journée."
-
-#: clientgui/sg_TaskPanel.cpp:1247
-msgid "Processing Suspended: Benchmarks Running."
-msgstr "Traitement Suspendu: Tests de puissance de l'ordinateur."
-
-#: clientgui/sg_TaskPanel.cpp:1249
-msgid "Processing Suspended."
-msgstr "Traitement Suspendu."
-
-#: clientgui/sg_TaskPanel.cpp:1253
-msgid "Waiting to contact project servers."
-msgstr "En attente du contact des serveurs des projets."
-
-#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
-msgid "Retrieving current status"
-msgstr "Recherche de l'état actuel"
-
-#: clientgui/sg_TaskPanel.cpp:1261
-msgid "No work available to process"
-msgstr "Aucun travail disponible à traiter"
-
-#: clientgui/sg_TaskPanel.cpp:1263
-msgid "Unable to connect to the core client"
-msgstr "Incapable de se connecter au client BOINC"
-
#: clientgui/TermsOfUsePage.cpp:218
msgid "Terms of Use"
msgstr "Conditions d'utilisation"
@@ -3250,7 +2932,10 @@ msgstr "'%s' ne contient pas de nom d'hôte valide."
msgid "'%s' does not contain a valid path."
msgstr "'%s' ne contient pas de chemin valide."
-#: clientgui/ViewMessages.cpp:84
+#. Setup View
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:192
+#: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
+#: clientgui/ViewWork.cpp:207
msgid "Commands"
msgstr "Commandes"
@@ -3294,6 +2979,79 @@ msgstr "Montrer tous les messages"
msgid "Show messages for all projects."
msgstr "Montre les messages pour tous les projets."
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Recherche d'avis; patientez s'il-vous-plaît..."
+
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Il n'y a pas de nouveaux messages."
+
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
+msgid "Notices"
+msgstr "Remarques"
+
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
+msgid "Update"
+msgstr "Mettre à jour"
+
+#: clientgui/ViewProjects.cpp:197 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:203 clientgui/ViewProjects.cpp:802
+#: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
+#: clientgui/sg_BoincSimpleFrame.cpp:893
+#: clientgui/sg_ProjectCommandPopup.cpp:72
+#: clientgui/sg_ProjectCommandPopup.cpp:128
+#: clientgui/sg_TaskCommandPopup.cpp:72 clientgui/sg_TaskCommandPopup.cpp:122
+msgid "Suspend"
+msgstr "Suspendre"
+
+#: clientgui/ViewProjects.cpp:204 clientgui/ViewProjects.cpp:802
+#: 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:210 clientgui/ViewProjects.cpp:821
+#: clientgui/sg_ProjectCommandPopup.cpp:78
+#: clientgui/sg_ProjectCommandPopup.cpp:136
+msgid "No new tasks"
+msgstr "Pas de nouveau travail"
+
+#: clientgui/ViewProjects.cpp:211 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:217 clientgui/sg_ProjectCommandPopup.cpp:84
+msgid "Reset project"
+msgstr "Recommencer le projet"
+
+#: clientgui/ViewProjects.cpp:218 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:225 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:231 clientgui/ViewWork.cpp:246
+#: clientgui/sg_ProjectCommandPopup.cpp:96
+#: clientgui/sg_TaskCommandPopup.cpp:84
+msgid "Properties"
+msgstr "Propriétés"
+
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
+msgid "Show project details."
+msgstr "Afficher les détails du projet."
+
#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
msgid "Account"
msgstr "Compte"
@@ -3339,14 +3097,48 @@ msgstr "Informe le projet de ne pas télécharger de travail supplémentaire..."
msgid "Resetting project..."
msgstr "Réinitialisation du projet en cours..."
+#: clientgui/ViewProjects.cpp:518 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:524 clientgui/sg_ProjectCommandPopup.cpp:235
+msgid "Reset Project"
+msgstr "Recommencer le projet"
+
#: clientgui/ViewProjects.cpp:563
msgid "Removing project..."
msgstr "En train de retirer le projet..."
+#: clientgui/ViewProjects.cpp:576 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:582 clientgui/sg_ProjectCommandPopup.cpp:272
+msgid "Remove Project"
+msgstr "Supprimer le projet"
+
#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
msgid "Launching browser..."
msgstr "Lancement du navigateur en cours..."
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
+msgstr "Reprend le travail pour ce projet."
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
+msgstr "Autoriser du nouveau travail"
+
+#: clientgui/ViewProjects.cpp:817 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:821 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:1140
msgid "Requested by user"
msgstr "Demandé par l'utilisateur"
@@ -3690,6 +3482,14 @@ msgstr "Montrer les tâches actives"
msgid "Show only active tasks."
msgstr "Ne montre que les tâches actives."
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
+msgid "Show graphics"
+msgstr "Montrer les graphiques"
+
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
+msgid "Show application graphics in a window."
+msgstr "Montre les graphiques de l'application dans une fenêtre."
+
#: clientgui/ViewWork.cpp:225
msgid "Show VM Console"
msgstr "Montrer la console VM"
@@ -3702,10 +3502,18 @@ msgstr "Montrer la console VM dans une fenêtre."
msgid "Suspend work for this result."
msgstr "Suspendre le calcul de cette unité."
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
+msgid "Abort"
+msgstr "Abandonner"
+
#: clientgui/ViewWork.cpp:240
msgid "Abandon work on the result. You will get no credit for it."
msgstr "Abandonner le calcul de cette unité. Vous n'obtiendrez pas de crédit pour cette unité."
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
+msgid "Show task details."
+msgstr "Afficher les détails de la tâche."
+
#: clientgui/ViewWork.cpp:264
msgid "Remaining (estimated)"
msgstr "Restant (estimation)"
@@ -3746,6 +3554,10 @@ msgstr "Etes-vous sûr de vouloir abandonner cette tâche '%s' ?\n(Avancement: %
msgid "Are you sure you want to abort these %d tasks?"
msgstr "Etes-vous sûr de vouloir annuler ces %d tâches ?"
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
+msgid "Abort task"
+msgstr "Abandonner la tâche"
+
#: clientgui/ViewWork.cpp:586
msgid "Aborting task..."
msgstr "Annulation de la tâche..."
@@ -3758,68 +3570,297 @@ msgstr "Montrer toutes les tâches"
msgid "Show all tasks."
msgstr "Montre toutes les tâches."
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Ajouter un projet ou un gestionnaire de compte"
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr "Reprendre le calcul de cette unité."
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Ajouter un projet ou utiliser un Gestionnaire de Compte BOINC."
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr "Suspendre le calcul de cette unité."
-#: clientgui/WelcomePage.cpp:297
-#, c-format
-msgid ""
-"If possible, add projects at the\n"
-"%s web site.\n"
-"\n"
-"Projects added via this wizard will not be\n"
-"listed on or managed via %s."
-msgstr "De préférence, ajoutez les projets sur le site %s.\n\nLes projets ajoutés via cet assistant ne seront pas\nlistés ou gérables via %s."
-
-#: clientgui/WelcomePage.cpp:313
-msgid ""
-"There are over 30 BOINC-based projects\n"
-"doing research in many areas of science,\n"
-"and you can volunteer for as many of them as you like.\n"
-"You can add a project directly,\n"
-"or use an 'Account Manager' web site to select projects."
-msgstr "Il y a plus de 30 projets basés sur BOINC\nfaisant de le recherche dans de nombreux domaines des sciences,\net vous pouvez vous porter volontaire pour tous ceux que vous voudrez.\nVous pouvez ajouter un projet directement,\nou utiliser un site web 'Gestionnaire de Comptes' pour sélectionner des projets."
-
-#: clientgui/WelcomePage.cpp:325
-msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
-"you contribute to.\n"
-"\n"
-"Some of these projects are run and managed by World Community Grid, while others\n"
-"are run and managed by other researchers or organizations. The BOINC software\n"
-"can divide your spare processing power among any combination of projects.\n"
-"\n"
-"Alternatively, if you have registered with a BOINC Account Manager, you can use\n"
-"this to choose which projects to support.\n"
-"\n"
-"Please choose which type of change you would like to make:\n"
-msgstr "Vous avez choisi d'ajouter un nouveau projet de calcul volontaire ou changez les projets auxquels vous contribuez.\nQuelques projets sont exécutés et administrés par World Community Grid, quand d'autres\nsont exécutés et administrés par d'autres chercheurs ou organisations. Le programme BOINC\npeut répartir la puissance de calcul que vous avez décidé de partager parmi une liste de projets.\nSinon, si vous vous êtes enregistrés avec un Gestionnaire de compte BOINC, vous pouvez l'utiliser\npour choisir quels projets supporter.\nS'il-vous-plaît, choisissez quel genre de changement vous voudriez faire:\n"
-
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Utiliser un gestionnaire de compte BOINC"
-
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Ajouter ou modifier vos projets World Community Grid"
-
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Ajouter des projets réalisés par d'autres chercheurs ou organisations"
-
-#: clientgui/WizardAttach.cpp:560
+#: clientgui/WizardAttach.cpp:563
msgid "Do you really want to cancel?"
msgstr "Voulez-vous vraiment annuler ?"
-#: clientgui/WizardAttach.cpp:561
+#: clientgui/WizardAttach.cpp:564
msgid "Question"
msgstr "Question"
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "Contrôle Camembert"
+
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
+msgid "Services"
+msgstr "Services"
+
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
+#, c-format
+msgid "Hide %s"
+msgstr "Cacher %s"
+
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
+msgstr "Caches les autres"
+
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
+msgstr "Montrer tout"
+
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
+msgstr "Quitter %s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr "Apparence"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr "Choisissez l'apparence de l'interface utilisateur."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Vue Avancée\tCTRL+SHIFT+A"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
+msgstr "Afficher l'interface graphique avancée."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr "Configuration des options d'affichage et des paramètres de proxy"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr "Afficher les messages de diagnostique."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
+msgstr "Valeur par défaut"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
+msgstr "Suspendre le calcul"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
+msgstr "Reprendre le calcul"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Ouvrir une fenêtre pour voir les messages des projets ou de BOINC"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:370
+#, c-format
+msgid "Get help with %s"
+msgstr "Obtenir de l'aide avec %s"
+
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Fermer"
+
+#: clientgui/sg_DlgMessages.cpp:394
+#, c-format
+msgid "%s - Notices"
+msgstr "Notifications de %s"
+
+#: clientgui/sg_DlgPreferences.cpp:206
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Pour des réglages supplémentaires, choisissez Préférences de Calcul dans la vue Avancée."
+
+#: clientgui/sg_DlgPreferences.cpp:345
+msgid "GB of disk space"
+msgstr "Go d'espace disque"
+
+#: clientgui/sg_DlgPreferences.cpp:1099
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - Préférences de calcul"
+
+#: clientgui/sg_DlgPreferences.cpp:1180
+msgid "Discard all 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/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Ajouter un projet"
+
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Synchroniser"
+
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Travail terminé pour ce projet"
+
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "Volontaire pour tout projet parmi la trentaine disponibles dans de nombreux domaines de sciences"
+
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Synchroniser les projets avec le gestionnaire de compte"
+
+#. TODO: Might want better wording for Project Selection Combo Box tooltip
+#: clientgui/sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "Choisir un projet à accéder avec les contrôles ci-dessous"
+
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Sites Web du projet"
+
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Commandes du projet"
+
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Afficher une liste des sites web pour le projet %s"
+
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Afficher une liste des commandes à appliquer au projet %s"
+
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "Suspendre cette tâche."
+
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Abandonner cette tâche. Vous ne recevrez pas de point(crédit) pour cette tâche."
+
+#: clientgui/sg_TaskCommandPopup.cpp:267
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Êtes-vous sûr de vouloir abandonner cette tâche '%s'?\n(Avancement: %.1lf%%, État: %s)"
+
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects. Please Add a Project."
+msgstr "Vous n'avez aucun projet. Veuillez Ajouter un projet."
+
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "Non disponible"
+
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "Tâches:"
+
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
+msgstr "Choisir une tâche"
+
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "De:"
+
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "Avancement de cette tâche"
+
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "Commandes de tâche"
+
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Afficher une liste des commandes applicables à cette tâche"
+
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "Application: %s"
+
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
+
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "Application: Non disponible"
+
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "Non disponible"
+
+#: clientgui/sg_TaskPanel.cpp:851
+#, c-format
+msgid "Elapsed: %s"
+msgstr "Écoulé: %s"
+
+#: clientgui/sg_TaskPanel.cpp:865
+#, c-format
+msgid "Remaining (estimated): %s"
+msgstr "Restant (estimation): %s"
+
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "Statut: %s"
+
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "Recherche de l'état actuel"
+
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "Téléchargement du travail depuis le serveur en cours"
+
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended: Running On Batteries."
+msgstr "Traitement Suspendu: Fonctionne sur Batteries."
+
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended: User Active."
+msgstr "Traitement Suspendu: Utilisateur Actif"
+
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended: User paused processing."
+msgstr "Traitement Suspendu: L'utilisateur a mis en pause le traitement."
+
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended: Time of Day."
+msgstr "Traitement Suspendu: Moment de la Journée."
+
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended: Benchmarks Running."
+msgstr "Traitement Suspendu: Tests de puissance de l'ordinateur."
+
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "Traitement Suspendu."
+
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "En attente du contact des serveurs des projets."
+
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "Recherche de l'état actuel"
+
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "Aucun travail disponible à traiter"
+
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
+msgstr "Incapable de se connecter au client BOINC"
+
#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
msgid "&Next >"
msgstr "&Suivant >"
@@ -3832,32 +3873,7 @@ msgstr "< &Retour"
msgid "&Finish"
msgstr "&Fin"
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Contrôle Camembert"
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Services"
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Cacher %s"
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Caches les autres"
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Montrer tout"
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "Quitter %s"
-
+#. /////////////////////////////////////////////////////////////////////////
#: clientgui/DlgAdvPreferencesBase.h:45
msgid "On this day of the week, compute only during these hours."
msgstr "En ce jour de la semaine, ne calculer que pendant ces heures."
diff --git a/locale/templates/BOINC-Manager.pot b/locale/templates/BOINC-Manager.pot
index cd76679a90..17fd4fe931 100644
--- a/locale/templates/BOINC-Manager.pot
+++ b/locale/templates/BOINC-Manager.pot
@@ -7,17 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC 7.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-29 16:43-0500\n"
-"PO-Revision-Date: 2015-04-29 16:44-0500\n"
+"POT-Creation-Date: 2015-04-30 14:53-0500\n"
+"PO-Revision-Date: 2015-04-30 14:56-0500\n"
"Last-Translator: Rom Walton \n"
"Language-Team: BOINC Localization Team \n"
+"Language: en_US\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: UNITED STATES\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
+"X-Generator: Poedit 1.7.6\n"
+"X-Poedit-KeywordsList: _\n"
"X-Poedit-SearchPath-0: clientgui\n"
"X-Poedit-SearchPath-1: clientgui\\common\n"
"X-Poedit-SearchPath-2: clientgui\\gtk\n"
@@ -67,13 +68,11 @@ msgstr ""
msgid "Find login information"
msgstr ""
-#: clientgui/AccountInfoPage.cpp:410
-#: clientgui/AccountInfoPage.cpp:632
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
msgid "&Password:"
msgstr ""
-#: clientgui/AccountInfoPage.cpp:417
-#: clientgui/AccountInfoPage.cpp:656
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
msgid "Choose a &password:"
msgstr ""
@@ -144,7 +143,8 @@ msgid "Please enter a password of at least %d characters."
msgstr ""
#: clientgui/AccountInfoPage.cpp:589
-msgid "The password and confirmation password do not match. Please type them again."
+msgid ""
+"The password and confirmation password do not match. Please type them again."
msgstr ""
#: clientgui/AccountManagerInfoPage.cpp:270
@@ -173,6 +173,8 @@ msgstr ""
msgid "Visit this account manager's web site"
msgstr ""
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
#: clientgui/AccountManagerProcessingPage.cpp:186
#: clientgui/AccountManagerPropertiesPage.cpp:192
#, c-format
@@ -227,23 +229,23 @@ msgstr ""
msgid "Shut down the currently connected BOINC client"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:353
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
#, c-format
msgid "Close the %s window"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:356
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
msgid "&Close window"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:365
-#: clientgui/AdvancedFrame.cpp:370
-#: clientgui/AdvancedFrame.cpp:375
+#: clientgui/AdvancedFrame.cpp:365 clientgui/AdvancedFrame.cpp:370
+#: clientgui/AdvancedFrame.cpp:375 clientgui/sg_BoincSimpleFrame.cpp:132
+#: clientgui/sg_BoincSimpleFrame.cpp:137
#, c-format
msgid "Exit %s"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:389
+#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
msgid "Preferences..."
msgstr ""
@@ -303,13 +305,13 @@ msgstr ""
msgid "Switch to the Simple View"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:451
-#: clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
msgid "&Add project..."
msgstr ""
-#: clientgui/AdvancedFrame.cpp:452
-#: clientgui/AdvancedFrame.cpp:476
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
msgid "Add a project"
msgstr ""
@@ -356,7 +358,7 @@ msgstr ""
msgid "Retry deferred file transfers and task requests"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:502
+#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
msgid "Event Log...\tCtrl+Shift+E"
msgstr ""
@@ -436,11 +438,11 @@ msgstr ""
msgid "Stop BOINC network activity"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:602
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
msgid "Computing &preferences..."
msgstr ""
-#: clientgui/AdvancedFrame.cpp:603
+#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
msgid "Configure computing preferences"
msgstr ""
@@ -468,7 +470,7 @@ msgstr ""
msgid "Enable or disable various diagnostic messages"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:624
+#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
msgid "&Other options..."
msgstr ""
@@ -492,12 +494,12 @@ msgstr ""
msgid "Read preferences from global_prefs_override.xml."
msgstr ""
-#: clientgui/AdvancedFrame.cpp:644
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
#, c-format
msgid "%s &help"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:648
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
#, c-format
msgid "Show information about %s"
msgstr ""
@@ -507,36 +509,36 @@ msgstr ""
msgid "&%s help"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:662
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
#, c-format
msgid "Show information about the %s"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:673
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
#, c-format
msgid "%s &web site"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:677
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
#, c-format
msgid "Show information about BOINC and %s"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:688
-#: clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:688 clientgui/BOINCTaskBar.cpp:544
+#: clientgui/sg_BoincSimpleFrame.cpp:262
#, c-format
msgid "&About %s..."
msgstr ""
-#: clientgui/AdvancedFrame.cpp:694
+#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
msgid "Licensing and copyright information."
msgstr ""
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
msgid "&File"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
msgid "&View"
msgstr ""
@@ -544,15 +546,16 @@ msgstr ""
msgid "&Activity"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
msgid "&Options"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:717
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
msgid "&Tools"
msgstr ""
-#: clientgui/AdvancedFrame.cpp:721
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
msgid "&Help"
msgstr ""
@@ -583,7 +586,7 @@ msgid ""
"and prompt you for another host to connect to."
msgstr ""
-#: clientgui/AdvancedFrame.cpp:1881
+#: clientgui/AdvancedFrame.cpp:1881 clientgui/DlgAbout.cpp:119
#, c-format
msgid "%s"
msgstr ""
@@ -651,7 +654,12 @@ msgstr ""
msgid "%s - Communication"
msgstr ""
-#: clientgui/AsyncRPC.cpp:1056
+#. m_btnClear = new wxButton( this, ID_SGPREFERENCESCLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
+#. m_btnClear->SetToolTip( _("Clear all local preferences listed above and close the dialog") );
+#. itemBoxSizer44->Add(m_btnClear, 0, wxALIGN_CENTER_VERTICAL|wxALL, ADJUSTFORXDPI(5));
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:361
msgid "Cancel"
msgstr ""
@@ -663,7 +671,8 @@ msgstr ""
#: clientgui/BOINCBaseFrame.cpp:521
msgid ""
"You currently are not authorized to manage the client.\n"
-"Please contact your administrator to add you to the 'boinc_users' local user group."
+"Please contact your administrator to add you to the 'boinc_users' local user "
+"group."
msgstr ""
#: clientgui/BOINCBaseFrame.cpp:530
@@ -701,7 +710,8 @@ msgstr ""
#, c-format
msgid ""
"%s is not able to start a %s client.\n"
-"Please launch the Control Panel->Administative Tools->Services applet and start the BOINC service."
+"Please launch the Control Panel->Administative Tools->Services applet and "
+"start the BOINC service."
msgstr ""
#: clientgui/BOINCBaseFrame.cpp:645
@@ -720,10 +730,12 @@ msgstr ""
#, c-format
msgid ""
"%s is not currently connected to a %s client.\n"
-"Please use the 'Advanced\\Select Computer...' menu option to connect up to a %s client.\n"
+"Please use the 'Advanced\\Select Computer...' menu option to connect up to a "
+"%s client.\n"
"To connect up to your local computer please use 'localhost' as the host name."
msgstr ""
+#. Create the web sites task group
#: clientgui/BOINCBaseView.cpp:790
msgid "Project web pages"
msgstr ""
@@ -808,7 +820,8 @@ msgstr ""
msgid " at "
msgstr ""
-#: clientgui/BOINCGUIApp.cpp:612
+#: clientgui/BOINCGUIApp.cpp:612 clientgui/MainDocument.cpp:2494
+#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
msgid ")"
msgstr ""
@@ -818,7 +831,7 @@ msgid ""
"Please reboot your computer and try again."
msgstr ""
-#: clientgui/BOINCGUIApp.cpp:643
+#: clientgui/BOINCGUIApp.cpp:643 clientgui/DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr ""
@@ -870,6 +883,7 @@ msgstr ""
msgid "Not used: workaround for bug in XCode 4.2"
msgstr ""
+#. These are just special tags so deal with them in a special way
#: clientgui/BOINCGUIApp.cpp:1166
msgid "(Automatic Detection)"
msgstr ""
@@ -892,14 +906,12 @@ msgstr ""
msgid "Open %s..."
msgstr ""
-#: clientgui/BOINCTaskBar.cpp:536
-#: clientgui/BOINCTaskBar.cpp:634
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:634
#: clientgui/BOINCTaskBar.cpp:639
msgid "Snooze"
msgstr ""
-#: clientgui/BOINCTaskBar.cpp:538
-#: clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:653
#: clientgui/BOINCTaskBar.cpp:658
msgid "Snooze GPU"
msgstr ""
@@ -908,7 +920,10 @@ msgstr ""
msgid "E&xit"
msgstr ""
-#: clientgui/BOINCTaskBar.cpp:629
+#: clientgui/BOINCTaskBar.cpp:629 clientgui/ViewProjects.cpp:798
+#: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
+#: clientgui/sg_ProjectCommandPopup.cpp:125
+#: clientgui/sg_TaskCommandPopup.cpp:118
msgid "Resume"
msgstr ""
@@ -980,10 +995,8 @@ msgid ""
"Click Finish to close."
msgstr ""
-#: clientgui/CompletionErrorPage.cpp:225
-#: clientgui/CompletionPage.cpp:222
-#: clientgui/CompletionPage.cpp:242
-#: clientgui/CompletionPage.cpp:273
+#: clientgui/CompletionErrorPage.cpp:225 clientgui/CompletionPage.cpp:222
+#: clientgui/CompletionPage.cpp:242 clientgui/CompletionPage.cpp:273
msgid "Click Finish to close."
msgstr ""
@@ -1014,6 +1027,7 @@ msgstr ""
msgid "Update completed."
msgstr ""
+#. Attach Completed
#: clientgui/CompletionPage.cpp:247
msgid "Now using account manager"
msgstr ""
@@ -1067,23 +1081,21 @@ msgstr ""
msgid "for more information."
msgstr ""
-#: clientgui/DlgAbout.cpp:219
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
#: clientgui/DlgSelectComputer.cpp:163
msgid "&OK"
msgstr ""
-#: clientgui/DlgAdvPreferences.cpp:682
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:779
msgid "Invalid number"
msgstr ""
-#: clientgui/DlgAdvPreferences.cpp:683
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:780
msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
msgstr ""
-#: clientgui/DlgAdvPreferences.cpp:684
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:781
msgid "Start time must be different from end time"
msgstr ""
@@ -1091,15 +1103,15 @@ msgstr ""
msgid "Number must be between 0 and 10"
msgstr ""
-#: clientgui/DlgAdvPreferences.cpp:686
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:782
msgid "Number must be between 0 and 100"
msgstr ""
-#: clientgui/DlgAdvPreferences.cpp:944
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:853
msgid "invalid input value detected"
msgstr ""
-#: clientgui/DlgAdvPreferences.cpp:946
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:855
msgid "Validation Error"
msgstr ""
@@ -1107,7 +1119,7 @@ msgstr ""
msgid "Discard local preferences and use web-based preferences?"
msgstr ""
-#: clientgui/DlgAdvPreferences.cpp:1159
+#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1181
msgid "Confirmation"
msgstr ""
@@ -1116,17 +1128,17 @@ msgstr ""
msgid "%s - Computing preferences"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:82
+#: clientgui/DlgAdvPreferencesBase.cpp:82 clientgui/sg_DlgPreferences.cpp:161
msgid ""
"Using local preferences.\n"
"Click \"Use web prefs\" to use web-based preferences from"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:90
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
msgid "Using web-based preferences from"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:107
+#: clientgui/DlgAdvPreferencesBase.cpp:107 clientgui/sg_DlgPreferences.cpp:187
msgid "Set values and click OK to use local preferences instead."
msgstr ""
@@ -1145,21 +1157,25 @@ msgstr ""
msgid "Clear all local preferences and close the dialog."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:123
+#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:216
msgid "Use web prefs"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:124
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:217
msgid "Restore web-based preferences and close the dialog."
msgstr ""
+#. Computing schedule
+#.
#: clientgui/DlgAdvPreferencesBase.cpp:148
-#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:643
msgid "Computing"
msgstr ""
+#. Network schedule
+#.
#: clientgui/DlgAdvPreferencesBase.cpp:151
-#: clientgui/DlgAdvPreferencesBase.cpp:790
+#: clientgui/DlgAdvPreferencesBase.cpp:791
msgid "Network"
msgstr ""
@@ -1172,9 +1188,8 @@ msgid "Daily schedules"
msgstr ""
#: clientgui/DlgAdvPreferencesBase.cpp:170
-#: clientgui/DlgDiagnosticLogFlags.cpp:119
-#: clientgui/DlgExclusiveApps.cpp:146
-#: clientgui/DlgHiddenColumns.cpp:100
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:352
msgid "OK"
msgstr ""
@@ -1186,8 +1201,10 @@ msgstr ""
msgid "Close the dialog without saving."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:181
-#: clientgui/DlgExclusiveApps.cpp:157
+#: clientgui/DlgAdvPreferencesBase.cpp:181 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:367
msgid "Help"
msgstr ""
@@ -1196,350 +1213,375 @@ msgid "Shows the preferences web page."
msgstr ""
#: clientgui/DlgAdvPreferencesBase.cpp:244
-#: clientgui/DlgAdvPreferencesBase.cpp:430
+#: clientgui/DlgAdvPreferencesBase.cpp:431
msgid "Usage limits"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:249
+#. Test Comment
+#: clientgui/DlgAdvPreferencesBase.cpp:250
#, no-c-format
-msgid "Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU."
+msgid ""
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:251
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: clientgui/DlgAdvPreferencesBase.cpp:264 clientgui/sg_DlgPreferences.cpp:307
msgid "Use at most"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:257
#, no-c-format
msgid "% of the CPUs"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:261
+#: clientgui/DlgAdvPreferencesBase.cpp:262 clientgui/sg_DlgPreferences.cpp:305
#, no-c-format
-msgid "Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat."
+msgid ""
+"Suspend/resume computing every few seconds to reduce CPU temperature and "
+"energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, "
+"and repeat."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:268
+#: clientgui/DlgAdvPreferencesBase.cpp:269 clientgui/sg_DlgPreferences.cpp:312
#, no-c-format
msgid "% of CPU time"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:275
+#: clientgui/DlgAdvPreferencesBase.cpp:276
msgid "When to suspend"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:281
+#: clientgui/DlgAdvPreferencesBase.cpp:282 clientgui/sg_DlgPreferences.cpp:242
msgid "Suspend when computer is on battery"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:284
-msgid "Check this to suspend computing on portables when running on battery power."
+#: clientgui/DlgAdvPreferencesBase.cpp:285 clientgui/sg_DlgPreferences.cpp:238
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:290
+#: clientgui/DlgAdvPreferencesBase.cpp:291 clientgui/sg_DlgPreferences.cpp:256
msgid "Suspend when computer is in use"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:293
-msgid "Check this to suspend computing and file transfers when you're using the computer."
+#: clientgui/DlgAdvPreferencesBase.cpp:294 clientgui/sg_DlgPreferences.cpp:252
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:299
+#: clientgui/DlgAdvPreferencesBase.cpp:300
msgid "Suspend GPU computing when computer is in use"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#: clientgui/DlgAdvPreferencesBase.cpp:303
msgid "Check this to suspend GPU computing when you're using the computer."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:307
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:308 clientgui/sg_DlgPreferences.cpp:267
msgid "This determines when the computer is considered 'in use'."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:311
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:271
msgid "'In use' means mouse/keyboard input in last"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:319
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#: clientgui/DlgAdvPreferencesBase.cpp:320
+#: clientgui/DlgAdvPreferencesBase.cpp:393 clientgui/sg_DlgPreferences.cpp:279
msgid "minutes"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:326
+#: clientgui/DlgAdvPreferencesBase.cpp:327
#, c-format
msgid "Suspend when non-%s CPU usage is above"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:328
+#: clientgui/DlgAdvPreferencesBase.cpp:329
msgid "Suspend computing when your computer is busy running other programs."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:349
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:350
+#: clientgui/DlgAdvPreferencesBase.cpp:480
msgid "Other"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:354
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:355
msgid "Store at least enough tasks to keep the computer busy for this long."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:358
msgid "Store at least"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:365
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:366
+#: clientgui/DlgAdvPreferencesBase.cpp:382
msgid "days of work"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:370
-msgid "Store additional tasks above the minimum level. Determines how much work is requested when contacting a project."
+#: clientgui/DlgAdvPreferencesBase.cpp:371
+msgid ""
+"Store additional tasks above the minimum level. Determines how much work is "
+"requested when contacting a project."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:373
+#: clientgui/DlgAdvPreferencesBase.cpp:374
msgid "Store up to an additional"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:386
+#: clientgui/DlgAdvPreferencesBase.cpp:387
#, c-format
msgid "If you run several projects, %s may switch between them this often."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:388
+#: clientgui/DlgAdvPreferencesBase.cpp:389
msgid "Switch between tasks every"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:396
-msgid "This controls how often tasks save their state to disk, so that they can be restarted later."
+#: clientgui/DlgAdvPreferencesBase.cpp:397
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:397
+#: clientgui/DlgAdvPreferencesBase.cpp:398
msgid "Request tasks to checkpoint at most every"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:401
+#: clientgui/DlgAdvPreferencesBase.cpp:402
msgid "seconds"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:436
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:437
msgid "Limit the download rate of file transfers."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:437
+#: clientgui/DlgAdvPreferencesBase.cpp:438
msgid "Limit download rate to"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:441
-#: clientgui/DlgAdvPreferencesBase.cpp:450
+#: clientgui/DlgAdvPreferencesBase.cpp:442
+#: clientgui/DlgAdvPreferencesBase.cpp:451
msgid "KB/second"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:446
msgid "Limit the upload rate of file transfers."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:446
+#: clientgui/DlgAdvPreferencesBase.cpp:447
msgid "Limit upload rate to"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:457
+#: clientgui/DlgAdvPreferencesBase.cpp:458
#, c-format
msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:459
+#: clientgui/DlgAdvPreferencesBase.cpp:460
msgid "Limit usage to"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:463
+#: clientgui/DlgAdvPreferencesBase.cpp:464
msgid "MB every"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:467
+#: clientgui/DlgAdvPreferencesBase.cpp:468
msgid "days"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:484
+#: clientgui/DlgAdvPreferencesBase.cpp:485
#, c-format
-msgid "Check this only if your Internet provider modifies image files. Skipping verification reduces the security of %s."
+msgid ""
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of %s."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:487
msgid "Skip data verification for image files"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:491
msgid "Confirm before connecting to Internet"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:491
-#: clientgui/DlgAdvPreferencesBase.cpp:495
+#: clientgui/DlgAdvPreferencesBase.cpp:492
+#: clientgui/DlgAdvPreferencesBase.cpp:496
msgid "Useful only if you have a modem, ISDN or VPN connection."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:494
+#: clientgui/DlgAdvPreferencesBase.cpp:495
msgid "Disconnect when done"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:522 clientgui/ViewResources.cpp:116
msgid "Disk"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:526
+#: clientgui/DlgAdvPreferencesBase.cpp:527
#, c-format
msgid "%s will use the most restrictive of these settings:"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:532
+#: clientgui/DlgAdvPreferencesBase.cpp:533 clientgui/sg_DlgPreferences.cpp:334
#, c-format
msgid "Limit the total amount of disk space used by %s."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:535
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: clientgui/DlgAdvPreferencesBase.cpp:536
+#: clientgui/DlgAdvPreferencesBase.cpp:560 clientgui/sg_DlgPreferences.cpp:337
msgid "Use no more than"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:540
msgid "GB"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:544
+#: clientgui/DlgAdvPreferencesBase.cpp:545
#, c-format
-msgid "Limit disk usage to leave this much free space on the volume where %s stores data."
+msgid ""
+"Limit disk usage to leave this much free space on the volume where %s stores "
+"data."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:547
+#: clientgui/DlgAdvPreferencesBase.cpp:548
msgid "Leave at least"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:552
msgid "GB free"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:556
+#: clientgui/DlgAdvPreferencesBase.cpp:557
#, c-format
-msgid "Limit the percentage of disk space used by %s on the volume where it stores data."
+msgid ""
+"Limit the percentage of disk space used by %s on the volume where it stores "
+"data."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:564
+#: clientgui/DlgAdvPreferencesBase.cpp:565
#, no-c-format
msgid "% of total"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:572
msgid "Memory"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:576
+#: clientgui/DlgAdvPreferencesBase.cpp:577
#, c-format
msgid "Limit the memory used by %s when you're using the computer."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:578
+#: clientgui/DlgAdvPreferencesBase.cpp:579
msgid "When computer is in use, use at most"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:584
-#: clientgui/DlgAdvPreferencesBase.cpp:596
-#: clientgui/DlgAdvPreferencesBase.cpp:612
+#: clientgui/DlgAdvPreferencesBase.cpp:585
+#: clientgui/DlgAdvPreferencesBase.cpp:597
+#: clientgui/DlgAdvPreferencesBase.cpp:613
#, no-c-format
msgid "%"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:589
+#: clientgui/DlgAdvPreferencesBase.cpp:590
#, c-format
msgid "Limit the memory used by %s when you're not using the computer."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:591
+#: clientgui/DlgAdvPreferencesBase.cpp:592
msgid "When computer is not in use, use at most"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:600
+#: clientgui/DlgAdvPreferencesBase.cpp:601
msgid "Leave non-GPU tasks in memory while suspended"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:601
-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."
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+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:605
+#: clientgui/DlgAdvPreferencesBase.cpp:606
#, c-format
msgid "Limit the swap space (page file) used by %s."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:607
+#: clientgui/DlgAdvPreferencesBase.cpp:608
msgid "Page/swap file: use at most"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:632
+#: clientgui/DlgAdvPreferencesBase.cpp:633 clientgui/sg_DlgPreferences.cpp:284
msgid "and"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:633
+#: clientgui/DlgAdvPreferencesBase.cpp:634
msgid "to"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:646
+#: clientgui/DlgAdvPreferencesBase.cpp:647 clientgui/sg_DlgPreferences.cpp:286
msgid "Compute only during a particular period each day."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:649
+#: clientgui/DlgAdvPreferencesBase.cpp:650 clientgui/sg_DlgPreferences.cpp:289
msgid "Compute only between"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:659
-#: clientgui/DlgAdvPreferencesBase.cpp:806
+#: clientgui/DlgAdvPreferencesBase.cpp:660
+#: clientgui/DlgAdvPreferencesBase.cpp:807
msgid "Day-of-week override"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:663
-#: clientgui/DlgAdvPreferencesBase.cpp:810
+#: clientgui/DlgAdvPreferencesBase.cpp:664
+#: clientgui/DlgAdvPreferencesBase.cpp:811
msgid "Override the times above on the selected days:"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:681
-#: clientgui/DlgAdvPreferencesBase.cpp:827
+#: clientgui/DlgAdvPreferencesBase.cpp:682
+#: clientgui/DlgAdvPreferencesBase.cpp:828
msgid "Monday"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:696
-#: clientgui/DlgAdvPreferencesBase.cpp:842
+#: clientgui/DlgAdvPreferencesBase.cpp:697
+#: clientgui/DlgAdvPreferencesBase.cpp:843
msgid "Friday"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:709
-#: clientgui/DlgAdvPreferencesBase.cpp:855
+#: clientgui/DlgAdvPreferencesBase.cpp:710
+#: clientgui/DlgAdvPreferencesBase.cpp:856
msgid "Tuesday"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:724
-#: clientgui/DlgAdvPreferencesBase.cpp:870
+#: clientgui/DlgAdvPreferencesBase.cpp:725
+#: clientgui/DlgAdvPreferencesBase.cpp:871
msgid "Saturday"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:737
-#: clientgui/DlgAdvPreferencesBase.cpp:883
+#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: clientgui/DlgAdvPreferencesBase.cpp:884
msgid "Wednesday"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:752
-#: clientgui/DlgAdvPreferencesBase.cpp:898
+#: clientgui/DlgAdvPreferencesBase.cpp:753
+#: clientgui/DlgAdvPreferencesBase.cpp:899
msgid "Sunday"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:765
-#: clientgui/DlgAdvPreferencesBase.cpp:911
+#: clientgui/DlgAdvPreferencesBase.cpp:766
+#: clientgui/DlgAdvPreferencesBase.cpp:912
msgid "Thursday"
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:794
+#: clientgui/DlgAdvPreferencesBase.cpp:795 clientgui/sg_DlgPreferences.cpp:316
msgid "Transfer files only during a particular period each day."
msgstr ""
-#: clientgui/DlgAdvPreferencesBase.cpp:796
+#: clientgui/DlgAdvPreferencesBase.cpp:797 clientgui/sg_DlgPreferences.cpp:318
msgid "Transfer files only between"
msgstr ""
@@ -1549,30 +1591,27 @@ msgid "%s Diagnostic Log Flags"
msgstr ""
#: clientgui/DlgDiagnosticLogFlags.cpp:83
-msgid "These flags enable various types of diagnostic messages in the Event Log."
+msgid ""
+"These flags enable various types of diagnostic messages in the Event Log."
msgstr ""
#: clientgui/DlgDiagnosticLogFlags.cpp:99
msgid "More info ..."
msgstr ""
-#: clientgui/DlgDiagnosticLogFlags.cpp:120
-#: clientgui/DlgHiddenColumns.cpp:101
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
msgid "Save all values and close the dialog"
msgstr ""
-#: clientgui/DlgDiagnosticLogFlags.cpp:123
-#: clientgui/DlgHiddenColumns.cpp:104
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
msgid "Defaults"
msgstr ""
-#: clientgui/DlgDiagnosticLogFlags.cpp:124
-#: clientgui/DlgHiddenColumns.cpp:105
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
msgid "Restore default settings"
msgstr ""
-#: clientgui/DlgDiagnosticLogFlags.cpp:128
-#: clientgui/DlgHiddenColumns.cpp:109
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
msgid "Close the dialog without saving"
msgstr ""
@@ -1581,20 +1620,23 @@ msgstr ""
msgid "%s - Event Log"
msgstr ""
-#: clientgui/DlgEventLog.cpp:237
+#. Create List Pane Items
+#: clientgui/DlgEventLog.cpp:237 clientgui/ViewMessages.cpp:117
+#: clientgui/ViewProjects.cpp:245 clientgui/ViewStatistics.cpp:411
+#: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
+#: clientgui/ViewWork.cpp:260
msgid "Project"
msgstr ""
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
msgid "Time"
msgstr ""
-#: clientgui/DlgEventLog.cpp:239
+#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
msgid "Message"
msgstr ""
-#: clientgui/DlgEventLog.cpp:301
-#: clientgui/DlgEventLog.cpp:351
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
msgid "&Show only this project"
msgstr ""
@@ -1602,8 +1644,8 @@ msgstr ""
msgid "Copy &All"
msgstr ""
-#: clientgui/DlgEventLog.cpp:307
-#: clientgui/DlgEventLog.cpp:311
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
msgid "Copy all the messages to the clipboard."
msgstr ""
@@ -1611,18 +1653,21 @@ msgstr ""
msgid "Copy &Selected"
msgstr ""
-#: clientgui/DlgEventLog.cpp:319
-#: clientgui/DlgEventLog.cpp:327
-msgid "Copy the selected messages to the clipboard. You can select multiple messages by holding down the shift or command key while clicking on messages."
+#: clientgui/DlgEventLog.cpp:319 clientgui/DlgEventLog.cpp:327
+#: clientgui/ViewMessages.cpp:97
+msgid ""
+"Copy the selected messages to the clipboard. You can select multiple "
+"messages by holding down the shift or command key while clicking on messages."
msgstr ""
-#: clientgui/DlgEventLog.cpp:321
-#: clientgui/DlgEventLog.cpp:329
-msgid "Copy the selected messages to the clipboard. You can select multiple messages by holding down the shift or control key while clicking on messages."
+#: clientgui/DlgEventLog.cpp:321 clientgui/DlgEventLog.cpp:329
+#: clientgui/ViewMessages.cpp:99
+msgid ""
+"Copy the selected messages to the clipboard. You can select multiple "
+"messages by holding down the shift or control key while clicking on messages."
msgstr ""
-#: clientgui/DlgEventLog.cpp:336
-#: clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
msgid "&Close"
msgstr ""
@@ -1630,13 +1675,11 @@ msgstr ""
msgid "Show all &messages"
msgstr ""
-#: clientgui/DlgEventLog.cpp:346
-#: clientgui/DlgEventLog.cpp:348
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
msgid "Show messages for all projects"
msgstr ""
-#: clientgui/DlgEventLog.cpp:352
-#: clientgui/DlgEventLog.cpp:354
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
msgid "Show only the messages for the selected project"
msgstr ""
@@ -1646,26 +1689,24 @@ msgid "%s - Exclusive Applications"
msgstr ""
#: clientgui/DlgExclusiveApps.cpp:72
-msgid "Suspend processor and network usage when these applications are running:"
+msgid ""
+"Suspend processor and network usage when these applications are running:"
msgstr ""
-#: clientgui/DlgExclusiveApps.cpp:80
-#: clientgui/DlgExclusiveApps.cpp:104
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
msgid "Add..."
msgstr ""
-#: clientgui/DlgExclusiveApps.cpp:81
-#: clientgui/DlgExclusiveApps.cpp:105
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
msgid "Add an application to this list"
msgstr ""
-#: clientgui/DlgExclusiveApps.cpp:86
-#: clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:90
msgid "Remove"
msgstr ""
-#: clientgui/DlgExclusiveApps.cpp:87
-#: clientgui/DlgExclusiveApps.cpp:111
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
msgid "Remove an application from this list"
msgstr ""
@@ -1689,8 +1730,9 @@ msgstr ""
msgid "shows the preferences web page"
msgstr ""
-#: clientgui/DlgExclusiveApps.cpp:303
-#: clientgui/DlgExclusiveApps.cpp:309
+#. TODO: fill in the default directory for MSW
+#. TODO: fill in the default directory for Linux
+#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
#: clientgui/DlgExclusiveApps.cpp:315
msgid "Applications to add"
msgstr ""
@@ -1700,8 +1742,7 @@ msgstr ""
msgid "'%s' is not an executable application."
msgstr ""
-#: clientgui/DlgExclusiveApps.cpp:333
-#: clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
#: clientgui/DlgExclusiveApps.cpp:404
msgid "Add Exclusive App"
msgstr ""
@@ -1760,10 +1801,9 @@ msgstr ""
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/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/wizardex.cpp:378
msgid "&Cancel"
msgstr ""
@@ -1782,17 +1822,17 @@ msgid "Select which columns %s should show."
msgstr ""
#: clientgui/DlgHiddenColumns.cpp:314
-msgid "Are you sure you want to reset all list columns to the default configurations?"
+msgid ""
+"Are you sure you want to reset all list columns to the default "
+"configurations?"
msgstr ""
#: clientgui/DlgHiddenColumns.cpp:315
msgid "Confirm defaults"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:194
-#: clientgui/DlgItemProperties.cpp:197
-#: clientgui/DlgItemProperties.cpp:200
-#: clientgui/DlgItemProperties.cpp:203
+#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
+#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
msgid "Don't fetch tasks for "
msgstr ""
@@ -1820,12 +1860,13 @@ msgstr ""
msgid " work fetch deferral interval"
msgstr ""
+#. set dialog title
#: clientgui/DlgItemProperties.cpp:239
msgid "Properties of project "
msgstr ""
-#: clientgui/DlgItemProperties.cpp:243
-#: clientgui/DlgOptions.cpp:221
+#. layout controls
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
msgid "General"
msgstr ""
@@ -1841,7 +1882,7 @@ msgstr ""
msgid "Team name"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
msgid "Resource share"
msgstr ""
@@ -1869,14 +1910,10 @@ msgstr ""
msgid "Non CPU intensive"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:260
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
-#: clientgui/DlgItemProperties.cpp:265
-#: clientgui/DlgItemProperties.cpp:268
-#: clientgui/DlgItemProperties.cpp:277
-#: clientgui/DlgItemProperties.cpp:280
-#: clientgui/DlgItemProperties.cpp:283
+#: clientgui/DlgItemProperties.cpp:260 clientgui/DlgItemProperties.cpp:262
+#: clientgui/DlgItemProperties.cpp:263 clientgui/DlgItemProperties.cpp:265
+#: clientgui/DlgItemProperties.cpp:268 clientgui/DlgItemProperties.cpp:277
+#: clientgui/DlgItemProperties.cpp:280 clientgui/DlgItemProperties.cpp:283
msgid "yes"
msgstr ""
@@ -1884,8 +1921,7 @@ msgstr ""
msgid "Suspended via GUI"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:262
-#: clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
msgid "no"
msgstr ""
@@ -1901,8 +1937,7 @@ msgstr ""
msgid "Trickle-up pending"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:271
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
msgid "Host location"
msgstr ""
@@ -1962,11 +1997,11 @@ msgstr ""
msgid "Properties of task "
msgstr ""
-#: clientgui/DlgItemProperties.cpp:357
+#: clientgui/DlgItemProperties.cpp:357 clientgui/ViewWork.cpp:266
msgid "Application"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:358
+#: clientgui/DlgItemProperties.cpp:358 clientgui/ViewWork.cpp:267
msgid "Name"
msgstr ""
@@ -1994,13 +2029,11 @@ msgstr ""
msgid "CPU time at last checkpoint"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:374
-#: clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
msgid "CPU time"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:376
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
msgid "Elapsed time"
msgstr ""
@@ -2028,12 +2061,12 @@ msgstr ""
msgid "Process ID"
msgstr ""
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
msgid "Local: "
msgstr ""
-#: clientgui/DlgOptions.cpp:129
-#: clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
msgid "Options"
msgstr ""
@@ -2097,34 +2130,31 @@ msgstr ""
msgid "HTTP Proxy Server Configuration"
msgstr ""
-#: clientgui/DlgOptions.cpp:283
-#: clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
msgid "Address:"
msgstr ""
-#: clientgui/DlgOptions.cpp:291
-#: clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
msgid "Port:"
msgstr ""
-#: clientgui/DlgOptions.cpp:299
-#: clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
msgid "Don't use proxy for:"
msgstr ""
-#: clientgui/DlgOptions.cpp:306
-#: clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
msgid "Leave these blank if not needed"
msgstr ""
-#: clientgui/DlgOptions.cpp:312
-#: clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
msgid "User Name:"
msgstr ""
-#: clientgui/DlgOptions.cpp:320
-#: clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
+#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
+#: clientgui/ProxyPage.cpp:366
msgid "Password:"
msgstr ""
@@ -2175,7 +2205,9 @@ msgstr ""
#: clientgui/DlgOptions.cpp:698
#, c-format
-msgid "The %s's language has been changed. In order for this change to take effect, you must restart the %s."
+msgid ""
+"The %s's language has been changed. In order for this change to take "
+"effect, you must restart the %s."
msgstr ""
#: clientgui/DlgSelectComputer.cpp:91
@@ -2194,8 +2226,7 @@ msgstr ""
msgid "Host name:"
msgstr ""
-#: clientgui/Localization.cpp:31
-#: clientgui/Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
msgid "Message boards"
msgstr ""
@@ -2207,15 +2238,12 @@ msgstr ""
msgid "Ask questions and report problems"
msgstr ""
-#: clientgui/Localization.cpp:39
-#: clientgui/Localization.cpp:81
-#: clientgui/Localization.cpp:111
-#: clientgui/Localization.cpp:129
+#: clientgui/Localization.cpp:39 clientgui/Localization.cpp:81
+#: clientgui/Localization.cpp:111 clientgui/Localization.cpp:129
msgid "Your account"
msgstr ""
-#: clientgui/Localization.cpp:41
-#: clientgui/Localization.cpp:87
+#: clientgui/Localization.cpp:41 clientgui/Localization.cpp:87
#: clientgui/Localization.cpp:113
msgid "View your account information and credit totals"
msgstr ""
@@ -2228,18 +2256,15 @@ msgstr ""
msgid "View and modify your SETI@home account profile and preferences"
msgstr ""
-#: clientgui/Localization.cpp:47
-#: clientgui/Localization.cpp:89
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
msgid "Your results"
msgstr ""
-#: clientgui/Localization.cpp:49
-#: clientgui/Localization.cpp:91
+#: clientgui/Localization.cpp:49 clientgui/Localization.cpp:91
msgid "View your last week (or more) of computational results and work"
msgstr ""
-#: clientgui/Localization.cpp:51
-#: clientgui/Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
msgid "Your computers"
msgstr ""
@@ -2247,13 +2272,11 @@ msgstr ""
msgid "View a listing of all the computers on which you are running SETI@Home"
msgstr ""
-#: clientgui/Localization.cpp:55
-#: clientgui/Localization.cpp:97
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
msgid "Your team"
msgstr ""
-#: clientgui/Localization.cpp:57
-#: clientgui/Localization.cpp:99
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
msgid "View information about your team"
msgstr ""
@@ -2274,7 +2297,8 @@ msgid "Read a detailed description of the Einstein@Home screensaver"
msgstr ""
#: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein@Home message boards"
+msgid ""
+"Correspond with admins and other users on the Einstein@Home message boards"
msgstr ""
#: clientgui/Localization.cpp:73
@@ -2302,7 +2326,8 @@ msgid "Account summary"
msgstr ""
#: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein@Home"
+msgid ""
+"View a listing of all the computers on which you are running Einstein@Home"
msgstr ""
#: clientgui/Localization.cpp:101
@@ -2310,7 +2335,9 @@ msgid "LIGO project"
msgstr ""
#: clientgui/Localization.cpp:103
-msgid "The home page of the Laser Interferometer Gravitational-wave Observatory (LIGO) project"
+msgid ""
+"The home page of the Laser Interferometer Gravitational-wave Observatory "
+"(LIGO) project"
msgstr ""
#: clientgui/Localization.cpp:105
@@ -2321,8 +2348,8 @@ msgstr ""
msgid "The home page of the GEO-600 project"
msgstr ""
-#: clientgui/Localization.cpp:115
-#: clientgui/Localization.cpp:133
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
+#: clientgui/ViewProjects.cpp:247 clientgui/ViewStatistics.cpp:441
msgid "Team"
msgstr ""
@@ -2403,7 +2430,9 @@ msgid "Missing application"
msgstr ""
#: clientgui/MainDocument.cpp:1827
-msgid "Please download and install the CoRD application from http://cord.sourceforge.net"
+msgid ""
+"Please download and install the CoRD application from http://cord."
+"sourceforge.net"
msgstr ""
#: clientgui/MainDocument.cpp:2442
@@ -2474,8 +2503,7 @@ msgstr ""
msgid "Downloading"
msgstr ""
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2551
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
msgid " (suspended - "
msgstr ""
@@ -2487,6 +2515,9 @@ msgstr ""
msgid "Task suspended by user"
msgstr ""
+#. an NCI process can be running even though computation is suspended
+#. (because of
+#.
#: clientgui/MainDocument.cpp:2507
msgid "Suspended - "
msgstr ""
@@ -2515,8 +2546,7 @@ msgstr ""
msgid "Waiting to run"
msgstr ""
-#: clientgui/MainDocument.cpp:2525
-#: clientgui/MainDocument.cpp:2528
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
msgid "Ready to start"
msgstr ""
@@ -2644,7 +2674,7 @@ msgstr ""
msgid "Categories:"
msgstr ""
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
msgid "Projects:"
msgstr ""
@@ -2672,14 +2702,15 @@ msgstr ""
msgid "Project URL:"
msgstr ""
-#: clientgui/ProjectInfoPage.cpp:486
-#: clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
#: clientgui/ProjectInfoPage.cpp:690
msgid "All"
msgstr ""
#: clientgui/ProjectInfoPage.cpp:735
-msgid "This project may not have work for your type of computer. Do you want to add it anyway?"
+msgid ""
+"This project may not have work for your type of computer. Do you want to "
+"add it anyway?"
msgstr ""
#: clientgui/ProjectInfoPage.cpp:767
@@ -2735,7 +2766,9 @@ msgid "User:"
msgstr ""
#: clientgui/ProjectWelcomePage.cpp:273
-msgid "WARNING: This project is not registered with BOINC. Make sure you trust it before continuing."
+msgid ""
+"WARNING: This project is not registered with BOINC. Make sure you trust it "
+"before continuing."
msgstr ""
#: clientgui/ProjectWelcomePage.cpp:277
@@ -2788,8 +2821,7 @@ msgstr ""
msgid "HTTP proxy"
msgstr ""
-#: clientgui/ProxyPage.cpp:337
-#: clientgui/ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
msgid "Server:"
msgstr ""
@@ -2801,374 +2833,6 @@ msgstr ""
msgid "SOCKS proxy"
msgstr ""
-#: clientgui/sg_BoincSimpleFrame.cpp:169
-msgid "Skin"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:171
-msgid "Select the appearance of the user interface."
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:181
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:182
-msgid "Display the advanced graphical interface."
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:198
-msgid "Configure display options and proxy settings"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:212
-msgid "Display diagnostic messages."
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:233
-#, c-format
-msgid "&%s"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:449
-msgid "Default"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:893
-msgid "Suspend"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:895
-msgid "Suspend Computing"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:896
-msgid "Resume Computing"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:912
-msgid "Notices"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:913
-msgid "Open a window to view notices from projects or BOINC"
-msgstr ""
-
-#: clientgui/sg_BoincSimpleFrame.cpp:934
-#, c-format
-msgid "Get help with %s"
-msgstr ""
-
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr ""
-
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr ""
-
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr ""
-
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:206
-msgid "For additional settings, select Computing Preferences in the Advanced View."
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:345
-msgid "GB of disk space"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:1099
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr ""
-
-#: clientgui/sg_DlgPreferences.cpp:1180
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-msgid "Update"
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-msgid "Suspend tasks for this project."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-msgid "No new tasks"
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-msgid "Don't get new tasks for this project."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-msgid "Reset project"
-msgstr ""
-
-#: 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/sg_ProjectCommandPopup.cpp:91
-msgid "Remove this project. Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-msgid "Properties"
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-msgid "Show project details."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-msgid "Don't fetch new tasks for this project."
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-msgid "Reset Project"
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr ""
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-msgid "Remove Project"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr ""
-
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr ""
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects. Please Add a Project."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1228
-msgid "Retrieving current status."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1234
-msgid "Downloading work from the server."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1239
-msgid "Processing Suspended: Running On Batteries."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1241
-msgid "Processing Suspended: User Active."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1243
-msgid "Processing Suspended: User paused processing."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1245
-msgid "Processing Suspended: Time of Day."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1247
-msgid "Processing Suspended: Benchmarks Running."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1249
-msgid "Processing Suspended."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1253
-msgid "Waiting to contact project servers."
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1257
-#: clientgui/sg_TaskPanel.cpp:1266
-msgid "Retrieving current status"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1261
-msgid "No work available to process"
-msgstr ""
-
-#: clientgui/sg_TaskPanel.cpp:1263
-msgid "Unable to connect to the core client"
-msgstr ""
-
#: clientgui/TermsOfUsePage.cpp:218
msgid "Terms of Use"
msgstr ""
@@ -3215,8 +2879,7 @@ msgstr ""
msgid "Invalid Account Key; please enter a valid Account Key"
msgstr ""
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
msgid "Validation conflict"
msgstr ""
@@ -3239,17 +2902,13 @@ msgid ""
"http://www.example.com/"
msgstr ""
-#: clientgui/ValidateURL.cpp:83
-#: clientgui/ValidateURL.cpp:87
-#: clientgui/ValidateURL.cpp:91
-#: clientgui/ValidateURL.cpp:103
-#: clientgui/ValidateURL.cpp:107
-#: clientgui/ValidateURL.cpp:110
+#: clientgui/ValidateURL.cpp:83 clientgui/ValidateURL.cpp:87
+#: clientgui/ValidateURL.cpp:91 clientgui/ValidateURL.cpp:103
+#: clientgui/ValidateURL.cpp:107 clientgui/ValidateURL.cpp:110
msgid "Invalid URL"
msgstr ""
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
#: clientgui/ValidateURL.cpp:92
msgid ""
"Please specify a valid URL.\n"
@@ -3257,8 +2916,7 @@ msgid ""
"http://boincproject.example.com"
msgstr ""
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
#, c-format
msgid "'%s' does not contain a valid host name."
msgstr ""
@@ -3268,7 +2926,12 @@ msgstr ""
msgid "'%s' does not contain a valid path."
msgstr ""
-#: clientgui/ViewMessages.cpp:84
+#.
+#. Setup View
+#.
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:192
+#: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
+#: clientgui/ViewWork.cpp:207
msgid "Commands"
msgstr ""
@@ -3280,13 +2943,11 @@ msgstr ""
msgid "Copy selected messages"
msgstr ""
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
msgid "Show only this project"
msgstr ""
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
msgid "Show only the messages for the selected project."
msgstr ""
@@ -3314,8 +2975,80 @@ msgstr ""
msgid "Show messages for all projects."
msgstr ""
-#: clientgui/ViewProjects.cpp:246
-#: clientgui/ViewStatistics.cpp:426
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr ""
+
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr ""
+
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
+msgid "Notices"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
+msgid "Update"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:197 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:203 clientgui/ViewProjects.cpp:802
+#: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
+#: clientgui/sg_BoincSimpleFrame.cpp:893
+#: clientgui/sg_ProjectCommandPopup.cpp:72
+#: clientgui/sg_ProjectCommandPopup.cpp:128
+#: clientgui/sg_TaskCommandPopup.cpp:72 clientgui/sg_TaskCommandPopup.cpp:122
+msgid "Suspend"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:204 clientgui/ViewProjects.cpp:802
+#: clientgui/sg_ProjectCommandPopup.cpp:73
+#: clientgui/sg_ProjectCommandPopup.cpp:129
+msgid "Suspend tasks for this project."
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:821
+#: clientgui/sg_ProjectCommandPopup.cpp:78
+#: clientgui/sg_ProjectCommandPopup.cpp:136
+msgid "No new tasks"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
+msgid "Don't get new tasks for this project."
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
+msgid "Reset project"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:218 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:225 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:231 clientgui/ViewWork.cpp:246
+#: clientgui/sg_ProjectCommandPopup.cpp:96
+#: clientgui/sg_TaskCommandPopup.cpp:84
+msgid "Properties"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
+msgid "Show project details."
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
msgid "Account"
msgstr ""
@@ -3327,8 +3060,7 @@ msgstr ""
msgid "Avg. work done"
msgstr ""
-#: clientgui/ViewProjects.cpp:251
-#: clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
#: clientgui/ViewWork.cpp:262
msgid "Status"
msgstr ""
@@ -3361,15 +3093,48 @@ msgstr ""
msgid "Resetting project..."
msgstr ""
+#: clientgui/ViewProjects.cpp:518 clientgui/sg_ProjectCommandPopup.cpp:229
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:235
+msgid "Reset Project"
+msgstr ""
+
#: clientgui/ViewProjects.cpp:563
msgid "Removing project..."
msgstr ""
-#: clientgui/ViewProjects.cpp:623
-#: clientgui/ViewWork.cpp:686
+#: clientgui/ViewProjects.cpp:576 clientgui/sg_ProjectCommandPopup.cpp:266
+#, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:272
+msgid "Remove Project"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
msgid "Launching browser..."
msgstr ""
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
+msgstr ""
+
+#: clientgui/ViewProjects.cpp:821 clientgui/sg_ProjectCommandPopup.cpp:137
+msgid "Don't fetch new tasks for this project."
+msgstr ""
+
#: clientgui/ViewProjects.cpp:1140
msgid "Requested by user"
msgstr ""
@@ -3535,13 +3300,11 @@ msgstr ""
msgid "Show chart for next project"
msgstr ""
-#: clientgui/ViewStatistics.cpp:2000
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2000 clientgui/ViewStatistics.cpp:2390
msgid "Hide project list"
msgstr ""
-#: clientgui/ViewStatistics.cpp:2001
-#: clientgui/ViewStatistics.cpp:2390
+#: clientgui/ViewStatistics.cpp:2001 clientgui/ViewStatistics.cpp:2390
msgid "Use entire area for graphs"
msgstr ""
@@ -3585,16 +3348,11 @@ msgstr ""
msgid "Statistics"
msgstr ""
-#: clientgui/ViewStatistics.cpp:2077
-#: clientgui/ViewStatistics.cpp:2098
-#: clientgui/ViewStatistics.cpp:2119
-#: clientgui/ViewStatistics.cpp:2141
-#: clientgui/ViewStatistics.cpp:2162
-#: clientgui/ViewStatistics.cpp:2183
-#: clientgui/ViewStatistics.cpp:2204
-#: clientgui/ViewStatistics.cpp:2225
-#: clientgui/ViewStatistics.cpp:2246
-#: clientgui/ViewStatistics.cpp:2270
+#: clientgui/ViewStatistics.cpp:2077 clientgui/ViewStatistics.cpp:2098
+#: clientgui/ViewStatistics.cpp:2119 clientgui/ViewStatistics.cpp:2141
+#: clientgui/ViewStatistics.cpp:2162 clientgui/ViewStatistics.cpp:2183
+#: clientgui/ViewStatistics.cpp:2204 clientgui/ViewStatistics.cpp:2225
+#: clientgui/ViewStatistics.cpp:2246 clientgui/ViewStatistics.cpp:2270
msgid "Updating charts..."
msgstr ""
@@ -3626,8 +3384,7 @@ msgstr ""
msgid "File"
msgstr ""
-#: clientgui/ViewTransfers.cpp:211
-#: clientgui/ViewWork.cpp:261
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
msgid "Progress"
msgstr ""
@@ -3635,8 +3392,7 @@ msgstr ""
msgid "Size"
msgstr ""
-#: clientgui/ViewTransfers.cpp:213
-#: clientgui/ViewWork.cpp:263
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
msgid "Elapsed"
msgstr ""
@@ -3714,16 +3470,22 @@ msgstr ""
msgid " (project backoff: "
msgstr ""
-#: clientgui/ViewWork.cpp:211
-#: clientgui/ViewWork.cpp:864
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
msgid "Show active tasks"
msgstr ""
-#: clientgui/ViewWork.cpp:212
-#: clientgui/ViewWork.cpp:865
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
msgid "Show only active tasks."
msgstr ""
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
+msgid "Show graphics"
+msgstr ""
+
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
+msgid "Show application graphics in a window."
+msgstr ""
+
#: clientgui/ViewWork.cpp:225
msgid "Show VM Console"
msgstr ""
@@ -3736,10 +3498,18 @@ msgstr ""
msgid "Suspend work for this result."
msgstr ""
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
+msgid "Abort"
+msgstr ""
+
#: clientgui/ViewWork.cpp:240
msgid "Abandon work on the result. You will get no credit for it."
msgstr ""
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
+msgid "Show task details."
+msgstr ""
+
#: clientgui/ViewWork.cpp:264
msgid "Remaining (estimated)"
msgstr ""
@@ -3780,6 +3550,10 @@ msgstr ""
msgid "Are you sure you want to abort these %d tasks?"
msgstr ""
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
+msgid "Abort task"
+msgstr ""
+
#: clientgui/ViewWork.cpp:586
msgid "Aborting task..."
msgstr ""
@@ -3792,6 +3566,14 @@ msgstr ""
msgid "Show all tasks."
msgstr ""
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr ""
+
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr ""
+
#: clientgui/WizardAttach.cpp:563
msgid "Do you really want to cancel?"
msgstr ""
@@ -3800,8 +3582,282 @@ msgstr ""
msgid "Question"
msgstr ""
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr ""
+
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
+msgid "Services"
+msgstr ""
+
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
+#, c-format
+msgid "Hide %s"
+msgstr ""
+
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
+msgstr ""
+
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
+msgstr ""
+
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
+msgstr ""
+
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:370
+#, c-format
+msgid "Get help with %s"
+msgstr ""
+
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr ""
+
+#: clientgui/sg_DlgMessages.cpp:394
+#, c-format
+msgid "%s - Notices"
+msgstr ""
+
+#: clientgui/sg_DlgPreferences.cpp:206
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr ""
+
+#: clientgui/sg_DlgPreferences.cpp:345
+msgid "GB of disk space"
+msgstr ""
+
+#: clientgui/sg_DlgPreferences.cpp:1099
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr ""
+
+#: clientgui/sg_DlgPreferences.cpp:1180
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr ""
+
+#. TODO: Might want better wording for Project Selection Combo Box tooltip
+#: clientgui/sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr ""
+
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr ""
+
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr ""
+
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr ""
+
+#: clientgui/sg_TaskCommandPopup.cpp:267
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects. Please Add a Project."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr ""
+
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:851
+#, c-format
+msgid "Elapsed: %s"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:865
+#, c-format
+msgid "Remaining (estimated): %s"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended: Running On Batteries."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended: User Active."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended: User paused processing."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended: Time of Day."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended: Benchmarks Running."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr ""
+
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
+msgstr ""
+
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
msgid "&Next >"
msgstr ""
@@ -3813,33 +3869,7 @@ msgstr ""
msgid "&Finish"
msgstr ""
-#: clientgui/common/wxPieCtrl.cpp:64
-#: clientgui\common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr ""
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr ""
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr ""
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr ""
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr ""
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr ""
-
+#. /////////////////////////////////////////////////////////////////////////
#: clientgui/DlgAdvPreferencesBase.h:45
msgid "On this day of the week, compute only during these hours."
msgstr ""
@@ -3847,4 +3877,3 @@ msgstr ""
#: clientgui/DlgAdvPreferencesBase.h:46
msgid "On this day of the week, transfer files only during these hours."
msgstr ""
-
diff --git a/locale/zh_CN/BOINC-Drupal.po b/locale/zh_CN/BOINC-Drupal.po
new file mode 100644
index 0000000000..cab5c0471b
--- /dev/null
+++ b/locale/zh_CN/BOINC-Drupal.po
@@ -0,0 +1,1432 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME
+#
+# Translators:
+# Yin Gang , 2015
+# 秦赫阳 , 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"POT-Creation-Date: 2015-04-29 14:36+0000\n"
+"PO-Revision-Date: 2015-05-01 10:53+0000\n"
+"Last-Translator: Yin Gang \n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/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 ""
+"CAPTCHA validation error: unknown CAPTCHA session ID. Contact the site "
+"administrator if this problem persists."
+msgstr "CAPTCHA 验证错误:未知的 CAPTCHA 会话 ID。如果问题一直存在请联系网站管理员。"
+
+msgid "The answer you entered for the CAPTCHA was not correct."
+msgstr "你输入的 CAPTCHA 答案不正确。"
+
+msgid "There are no tasks of this type on record"
+msgstr "没有该类型的任务记录"
+
+msgid ""
+"This will remove all of your settings from the @name preference set. Are you"
+" sure?"
+msgstr "将要移除你在 @name 的所有参数设定,确定继续吗?"
+
+msgid ""
+"On computers attached to multiple projects, the most recently modified "
+"preferences will be used."
+msgstr "对于加入了多个项目的计算机,将使用最近更新过的参数设定。"
+
+msgid "Preferences last modified: @mod_time"
+msgstr "参数设定最后的修改时间:@mod_time"
+
+msgid "Switch View"
+msgstr "切换视图"
+
+msgid ""
+"This will remove all of your settings from the \"@name\" preference set. Are"
+" you sure?"
+msgstr "将要移除你在“@name”的所有参数设定,确定继续吗?"
+
+msgid ""
+"This account's default language for e-mails and preferred language for site "
+"presentation."
+msgstr "该账户用于电子邮件的缺省语言和站点内容呈现的首选语言"
+
+msgid ""
+"If you have a valid Gravatar associated with"
+" your e-mail address, it will be used for your user picture."
+msgstr "如果你有一个正确的 Gravatar 和你的电子邮件地址关联,它将被用作你的用户图片。"
+
+msgid "Your Gravatar will not be shown if you upload a user picture."
+msgstr "如果你上传了一张用户图片,则不会显示你的 Gravatar。"
+
+msgid ""
+"If you have a valid Gravatar associated with"
+" your e-mail address, use it for your user picture."
+msgstr "如果你有一个正确的 Gravatar 与你的电子邮件地址关联,它将被用作你的用户图片。"
+
+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 "In discussion topics, show at most @comments_per_page"
+msgstr "在讨论主题里,最多显示 @comments_per_page 条回复"
+
+msgid "Sort comments in discussions"
+msgstr "讨论主题的回复排序"
+
+msgid "Your signature will be publicly displayed at the end of your comments."
+msgstr "你的签字将在回复的最后进行显示。"
+
+msgid "Hide signatures in forums"
+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 "Lock this thread for comments"
+msgstr "关闭本主题"
+
+msgid "Make this topic sticky"
+msgstr "将本主题置顶显示"
+
+msgid "You must earn 1 more credit!"
+msgstr "你的积分必须至少为1!"
+
+msgid "Click here to become a member of @this_team"
+msgstr "点击这里成为 @this_team 的成员"
+
+msgid "A discussion forum has been set up for team members."
+msgstr "已为团队成员创建论坛。"
+
+msgid "Enter forum"
+msgstr "进入论坛"
+
+msgid "Leave team"
+msgstr "离开团队"
+
+msgid "Click here to revoke your membership with @this_team"
+msgstr "点击这里来退出 @this_team"
+
+msgid "Leave this team"
+msgstr "离开该团队"
+
+msgid "Edit message board"
+msgstr "编辑留言板"
+
+msgid "Message board title"
+msgstr "留言板标题"
+
+msgid "Text only, no HTML tags"
+msgstr "仅文本,不允许 HTML 标签"
+
+msgid "Minimum time between posts"
+msgstr "最小的发贴时间间隔"
+
+msgid "Seconds"
+msgstr "秒"
+
+msgid "Minimum avg credit to post"
+msgstr "发帖要求的最低平均积分"
+
+msgid "Allow public to read board?"
+msgstr "是否允许公众访问该留言板?"
+
+msgid "Save message board"
+msgstr "保存留言板"
+
+msgid "About message boards"
+msgstr "关于留言板"
+
+msgid "This is a team-only message board"
+msgstr "这里只对团队成员开放的留言板"
+
+msgid "Only members may post"
+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 "增加团队管理员"
+
+msgid "Enter email address"
+msgstr "输入电子邮件地址"
+
+msgid "Current team admins"
+msgstr "当前的团队管理员"
+
+msgid "About team admins"
+msgstr "关于团队管理员"
+
+msgid "Team admins can:"
+msgstr "团队管理员可以:"
+
+msgid "Edit team information"
+msgstr "编辑团队信息"
+
+msgid "View the team's join / quit history"
+msgstr "查看团队的成员加入、退出历史"
+
+msgid "Moderate the team forum"
+msgstr "团队论坛仲裁"
+
+msgid "Remove members from the team"
+msgstr "从团队中移除成员"
+
+msgid "Disband a team if it has no members"
+msgstr "解散没有成员的团队"
+
+msgid "Team admins cannot:"
+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 "选择类型"
+
+msgid "Team name -- HTML version (optional)"
+msgstr "团队名称 -- HTML 版本(可选)"
+
+msgid "You may use limited HTML tags"
+msgstr "你可以使用有限的 HTML 标签"
+
+msgid "Team website (optional)"
+msgstr "团队网站(可选)"
+
+msgid "Displayed on the team's page"
+msgstr "在团队页面上显示"
+
+msgid "Create new team"
+msgstr "创建新团队"
+
+msgid "Save team"
+msgstr "保存团队"
+
+msgid "Create team message board"
+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."
+msgstr "请设置用户在该留言板发贴所要求的最小平均积分。"
+
+msgid "Post new topic"
+msgstr "发表新主题"
+
+msgid "Unpublished"
+msgstr "未发表"
+
+msgid "parent removed"
+msgstr "parent 已移除"
+
+msgid "Sorry, unrecognized email address or password."
+msgstr "对不起,无法识别的邮件地址或登录密码。"
+
+msgid "Have you forgotten your password?"
+msgstr "忘记密码?"
+
+msgid "Id"
+msgstr "ID"
+
+msgid "Total Credit"
+msgstr "总积分"
+
+msgid "Admin since"
+msgstr "成为管理员"
+
+msgid "Team ID"
+msgstr "团队 ID"
+
+msgid "User joined"
+msgstr "成为用户"
+
+msgid "Timestamp"
+msgstr "时间戳"
+
+msgid "Account Key"
+msgstr "帐户密钥"
+
+msgid "CPID"
+msgstr "CPID"
+
+msgid "Password Hash"
+msgstr "密码哈希"
+
+msgid "Postal Code"
+msgstr "邮编"
+
+msgid "Send Email"
+msgstr "发送邮件"
+
+msgid "Show Hosts"
+msgstr "显示主机"
+
+msgid "Free disk space"
+msgstr "剩余磁盘空间"
+
+msgid "Cross project ID"
+msgstr "跨项目标识符(CPID)"
+
+msgid "Last IP address"
+msgstr "最近使用的 IP 地址"
+
+msgid "Maximum daily WU quota per CPU"
+msgstr "单 CPU 每日 WU 限额"
+
+msgid "Same IP address count"
+msgstr "同 IP 地址的数量"
+
+msgid "% of time BOINC client is running"
+msgstr "% BOINC 客户端运行时间"
+
+msgid "Operating system version"
+msgstr "操作系统版本"
+
+msgid "CPU model"
+msgstr "CPU 型号"
+
+msgid "Serial number"
+msgstr "序列号"
+
+msgid "Timezone"
+msgstr "时区"
+
+msgid "Platform ID"
+msgstr "平台 ID"
+
+msgid "Task ID"
+msgstr "任务 ID"
+
+msgid "Application ID"
+msgstr "应用程序 ID"
+
+msgid "Granted credit"
+msgstr "授予的积分"
+
+msgid "Received time"
+msgstr "接收时间"
+
+msgid "Stderr out"
+msgstr "标准错误输出"
+
+msgid "Validation state"
+msgstr "验证状态"
+
+msgid "App ID"
+msgstr "应用 ID"
+
+msgid "Canonical credit"
+msgstr "规范积分"
+
+msgid "Canonical result ID"
+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 "App version ID"
+msgstr "应用版本 ID"
+
+msgid "@count million ops/sec"
+msgstr "@count 百万操作/秒"
+
+msgid "@rate KiB/sec"
+msgstr "@rate 千字节/秒"
+
+msgid "@count days"
+msgstr "@count 天"
+
+msgid "Remove friend"
+msgstr "移除朋友"
+
+msgid "Ban user"
+msgstr "禁止用户"
+
+msgid "Reply to this comment"
+msgstr "回复该消息"
+
+msgid "Reply to this comment with quote"
+msgstr "引用回复该消息"
+
+msgid "Edit this comment"
+msgstr "编辑此回复"
+
+msgid "Delete this comment"
+msgstr "删除此回复"
+
+msgid "Hide this comment"
+msgstr "隐藏此恢复"
+
+msgid "Convert"
+msgstr "转换"
+
+msgid "Convert this comment to a new topic"
+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 "Email address"
+msgstr "电子邮件地址"
+
+msgid "Home"
+msgstr "家庭"
+
+msgid "Login"
+msgstr "登录"
+
+msgid "search"
+msgstr "搜索"
+
+msgid "Server status"
+msgstr "服务器状态"
+
+msgid "Language"
+msgstr "语言"
+
+msgid "Enter your @s email address."
+msgstr "请输入您的 @s 电子邮件地址。"
+
+msgid "Join now"
+msgstr "现在加入"
+
+msgid "I'm new"
+msgstr "我是个新人"
+
+msgid "I'm a BOINC user"
+msgstr "我是一个 BOINC 用户"
+
+msgid "Welcome back!"
+msgstr "欢迎回来!"
+
+msgid ""
+"Einstein@Home is a program that uses your computer's idle time to run a "
+"screensaver to search for gravitational waves from spinning neutron stars "
+"(also called pulsars) using data from the LIGO gravitational wave detector."
+msgstr "Einstein@Home项目使用您计算机的空闲时间来搜索从脉冲星发出的引力波。所使用的数据由LIGO引力波探测器提供。"
+
+msgid "Learn more"
+msgstr "了解更多信息"
+
+msgid "View account"
+msgstr "查看帐户"
+
+msgid "About our screensaver"
+msgstr "关于我们的屏幕保护程序"
+
+msgid "Over 500,000 volunteers and counting."
+msgstr "超过50万名并还在继续增加的志愿者"
+
+msgid "Windows"
+msgstr "Windows"
+
+msgid "Mac"
+msgstr "Mac"
+
+msgid "Linux"
+msgstr "Linux"
+
+msgid "Logout"
+msgstr "注销"
+
+msgid "Name"
+msgstr "任务名称"
+
+msgid "Avg credit"
+msgstr "平均积分"
+
+msgid "Total credit"
+msgstr "总积分"
+
+msgid "Enter your password to save changes"
+msgstr "输入您的密码以保存更改"
+
+msgid ""
+"Enter your current password if changing your email\n"
+" address or password."
+msgstr "如果您要更改电子邮件地址或密码\n请输入您的当前密码。"
+
+msgid "BOINC user ID"
+msgstr "BOINC用户ID"
+
+msgid "Drupal user ID"
+msgstr "Drupal用户ID"
+
+msgid "Account key"
+msgstr "帐户密钥"
+
+msgid "Weak account key"
+msgstr "弱帐户密钥"
+
+msgid "Cross-project ID"
+msgstr "跨项目标识符(CPID)"
+
+msgid "Save changes"
+msgstr "保存更改"
+
+msgid "Cancel"
+msgstr "取消"
+
+msgid "Change password"
+msgstr "修改用户口令"
+
+msgid "What is @this_project?"
+msgstr "@this_project 是什么?"
+
+msgid "no projects..."
+msgstr "没有项目..."
+
+msgid "Download the desktop software"
+msgstr "下载桌面软件"
+
+msgid "Run the installer"
+msgstr "运行安装程序"
+
+msgid "When prompted enter @siteurl"
+msgstr "根据提示输入 @siteurl"
+
+msgid "Password"
+msgstr "用户口令"
+
+msgid "Enter the password that accompanies your username."
+msgstr "输入用户名对应的密码"
+
+msgid "Request new password"
+msgstr "请求新密码"
+
+msgid ""
+"If you're already running BOINC, select Add\n"
+" Project."
+msgstr "如果你已经在使用 BOINC,选择增加项目。"
+
+msgid ""
+"If you're running a command-line version of BOINC,\n"
+" first use the BOINC Manager software (elsewhere if necessary) to create an\n"
+" an account at this project, then use that account to connect with the\n"
+" command-line version."
+msgstr "如果你正在使用命令行版本的 BOINC,\n先使用 BOINC Manager 创建该项目的账户,\n然后在命令行版本中使用该账户来连接。"
+
+msgid ""
+"If you're running a pre-5.0 version of BOINC, please\n"
+" upgrade to a more recent version to create an account\n"
+" at this project."
+msgstr "如果你在使用 5.0 之前版本的 BOINC,请升级到更近的版本来创建账户。"
+
+msgid ""
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) 如果你知道你的账户和电子邮件地址,你可以在这里接收邮件:"
+
+msgid ""
+"Enter the email address and click OK. You will be sent email instructions "
+"for resetting your password."
+msgstr "输入电子邮件地址并点击确定,你将会收到电子邮件来指导你来重置你的登录密码。"
+
+msgid "OK"
+msgstr "确定"
+
+msgid "The latest news from the @site_name project"
+msgstr "来自 @site_name 项目的最新消息"
+
+msgid "Comment form"
+msgstr "评论表格"
+
+msgid "Total credits"
+msgstr "总积分"
+
+msgid "Recent avg credits"
+msgstr "近期平均积分"
+
+msgid "Country"
+msgstr "国家或地区"
+
+msgid "Type"
+msgstr "类型"
+
+msgid "Founder"
+msgstr "创建人"
+
+msgid "New members in last day"
+msgstr "昨天新加入的成员"
+
+msgid "Total members"
+msgstr "所有成员"
+
+msgid "Active members"
+msgstr "活跃的成员"
+
+msgid "Members with credit"
+msgstr "有积分的成员"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Search teams"
+msgstr "搜索团队"
+
+msgid "Send message"
+msgstr "发送消息"
+
+msgid "BOINC"
+msgstr "BOINC"
+
+msgid "Project"
+msgstr "项目"
+
+msgid "Web site"
+msgstr "网站"
+
+msgid "No active computers"
+msgstr "没有活跃的计算机"
+
+msgid "This user has no computers that have been active in the last 30 days."
+msgstr "用户在过去 30 天没有活跃的计算机"
+
+msgid " Default value: @default"
+msgstr "缺省值:@default"
+
+msgid "Applications"
+msgstr "计算程序"
+
+msgid "yes"
+msgstr "是"
+
+msgid "no"
+msgstr "否"
+
+msgid "Message @id"
+msgstr "消息 @id"
+
+msgid "message @id"
+msgstr "消息 @id"
+
+msgid " in response to !parent"
+msgstr "回复 !parent"
+
+msgid "Credits per day"
+msgstr "每日积分"
+
+msgid "Computers hidden"
+msgstr "计算机已隐藏"
+
+msgid "This user has chosen not to show information about their computers."
+msgstr "该用户已选择不显示他的计算机信息。"
+
+msgid "Stderr output"
+msgstr "标准错误输出"
+
+msgid "@time ago"
+msgstr "@time 之前"
+
+msgid "n/a"
+msgstr "不适用"
+
+msgid "Submitted by !username on !datetime"
+msgstr "由 !username 在 !datetime 提交"
+
+msgid "Member since"
+msgstr "成为成员"
+
+msgid "View team"
+msgstr "查看团队"
+
+msgid "Friends (@count)"
+msgstr "朋友(@count)"
+
+msgid "Website"
+msgstr "网站"
+
+msgid "Locked"
+msgstr "已锁定"
+
+msgid "Computers pending"
+msgstr "等待的计算机"
+
+msgid ""
+"This user does not yet have any associated computers. Computers will be "
+"displayed when they have earned their first credits."
+msgstr "该用户没有关联的计算机,计算机将在首次得到积分后显示出来。"
+
+msgid "No results found..."
+msgstr "未找到结果..."
+
+msgid "Background"
+msgstr "背景"
+
+msgid "Teams"
+msgstr "团队"
+
+msgid ""
+"@project participants may form teams. You may belong to only one team. You "
+"can join or quit a team at any time. To join a team, visit its team page and"
+" click \"Join this team\". Each team has a founder who may:"
+msgstr "@project 项目的参与者可以组成团队。你只能加入一个团队。你可以在任何时间加入或退出团队。要加入团队,访问团队页面并点击“加入该团队”。每个团队都有一个创建人,他可以:"
+
+msgid "access team members' email addresses"
+msgstr "访问团队成员的电子邮件地址"
+
+msgid "edit the team's name and description"
+msgstr "编辑团队的名称及描述"
+
+msgid "add or remove team admins"
+msgstr "增加或移除团队管理员"
+
+msgid "remove members from the team"
+msgstr "移除团队中的成员"
+
+msgid "disband a team if it has no members"
+msgstr "解散没有成员的团队"
+
+msgid "Create a new team"
+msgstr "创建新团队"
+
+msgid ""
+"If you cannot find a team that is right for you, you can create a team."
+msgstr "如果找不到对你合适的团队,你也可以创建一个团队。"
+
+msgid "You must earn @count more credits!"
+msgstr "你还需要得到 @count 积分!"
+
+msgid "Threads"
+msgstr "主题"
+
+msgid "Posts"
+msgstr "贴数"
+
+msgid "Last post"
+msgstr "最近发贴"
+
+msgid "Manage subscriptions"
+msgstr "订阅管理"
+
+msgid "Featured"
+msgstr "特色"
+
+msgid "Submitted on !datetime"
+msgstr "提交于 !datetime"
+
+msgid "Comments"
+msgstr "评论"
+
+msgid "Opinion"
+msgstr "意见"
+
+msgid "More"
+msgstr "更多"
+
+msgid "Tasks"
+msgstr "任务"
+
+msgid "Generic"
+msgstr "一般"
+
+msgid "Work"
+msgstr "工作"
+
+msgid "School"
+msgstr "学习"
+
+msgid "Presets"
+msgstr "预设"
+
+msgid "Standard"
+msgstr "标准"
+
+msgid "Maximum"
+msgstr "最大"
+
+msgid "Green"
+msgstr "绿"
+
+msgid "Minimum"
+msgstr "最小"
+
+msgid "Custom"
+msgstr "定制"
+
+msgid "Update preset"
+msgstr "更新预设"
+
+msgid "Advanced settings"
+msgstr "高级设定"
+
+msgid "Processor usage"
+msgstr "处理器使用"
+
+msgid "Run while computer is on battery power?"
+msgstr "电池供电时仍进行计算?"
+
+msgid "Only applies to portable computers"
+msgstr "仅适用于移动电脑"
+
+msgid "Run while computer is in use?"
+msgstr "计算机在使用时仍进行计算?"
+
+msgid "Run GPU work while computer is in use?"
+msgstr "计算机在使用时仍进行 GPU 计算?"
+
+msgid "Enforced by version @number"
+msgstr "要求版本 @number"
+
+msgid "\"In use\" means mouse/keyboard activity in last"
+msgstr "“在使用”表示最近一段时间有鼠标键盘操作"
+
+msgid "minutes"
+msgstr "分钟"
+
+msgid "Suspend work if no mouse/keyboard activity in last"
+msgstr "如果最近一段时间无键盘鼠标操作则暂停计算"
+
+msgid "Needed to enter low-power mode on some computers"
+msgstr "在一些计算机上需要进入低功耗模式"
+
+msgid "Suspend work if CPU usage is above"
+msgstr "如果 CPU 使用率超过则暂停计算"
+
+msgid "0 means no restriction. Enforced by version @number"
+msgstr "0 表示不限制,要求版本 @number"
+
+msgid "Do work only between the hours of:"
+msgstr "计算时间段"
+
+msgid "and"
+msgstr "到"
+
+msgid "No restriction if equal"
+msgstr "如果相同即表示不进行限制"
+
+msgid "Leave tasks in memory while suspended?"
+msgstr "计算暂停时仍将任务驻留在内存?"
+
+msgid "Suspended tasks will consume swap space if \"yes\""
+msgstr "如果选择是,则暂停的任务仍将消耗交换空间"
+
+msgid "Switch between tasks every"
+msgstr "每隔多少分钟切换任务"
+
+msgid "Recommended: @period minutes"
+msgstr "建议值:@period 分钟"
+
+msgid "On multiprocessors, use at most"
+msgstr "在多处理器计算机上,最多使用"
+
+msgid "processors"
+msgstr "处理器"
+
+msgid "Set to 0 for no limit"
+msgstr "设置为 0 表示不限制"
+
+msgid "% of the processors"
+msgstr "% 的处理器"
+
+msgid "Use at most"
+msgstr "最多使用"
+
+msgid "% of the CPU time"
+msgstr "@ CPU 时间"
+
+msgid "Can be used to reduce CPU heat"
+msgstr "能用于减少 CPU 发热量"
+
+msgid "Disk and memory usage"
+msgstr "磁盘和内存使用"
+
+msgid "Disk: use at most"
+msgstr "磁盘:最多使用"
+
+msgid "Disk: leave free at least"
+msgstr "磁盘:至少预留空闲"
+
+msgid "Values smaller than @number are ignored"
+msgstr "小于 @number 的值将被忽略"
+
+msgid "% of total"
+msgstr "%"
+
+msgid "Tasks checkpoint to disk at most every"
+msgstr "任务的最短存盘间隔"
+
+msgid "seconds"
+msgstr "秒"
+
+msgid "Swap space: use at most"
+msgstr "交换空间:最多使用"
+
+msgid "Memory: when computer is in use, use at most"
+msgstr "内存:如果计算机在使用中,最多使用"
+
+msgid "Memory: when computer is not in use, use at most"
+msgstr "内存:如果计算机未在使用,最多使用"
+
+msgid "Network usage"
+msgstr "网络使用"
+
+msgid "Computer is connected to the Internet about every"
+msgstr "计算机连接互联网的时间间隔"
+
+msgid "days"
+msgstr "天"
+
+msgid ""
+"Leave blank or 0 if always connected. @project will try to maintain at least"
+" this much work."
+msgstr "如果是一直连接则留空或输入 0。@project 将申请至少相应的任务数量。"
+
+msgid "Maintain enough work for an additional"
+msgstr "申请额外的任务量"
+
+msgid "Confirm before connecting to Internet?"
+msgstr "连接到互联网前进行确认?"
+
+msgid "Matters only if you have a modem, ISDN, or VPN connection"
+msgstr "仅在使用调制解调器,ISDN 或 VPN 连接时有关系"
+
+msgid "Disconnect when done?"
+msgstr "完成后断开连接?"
+
+msgid "Maximum download rate"
+msgstr "最大下载速率"
+
+msgid "Maximum upload rate"
+msgstr "最大上传速率"
+
+msgid "Use network only between the hours of:"
+msgstr "允许使用网络的时间段:"
+
+msgid "Transfer at most"
+msgstr "最多传输"
+
+msgid "Skip image file verification?"
+msgstr "跳过映像文件验证?"
+
+msgid ""
+"Check this ONLY if your Internet provider modifies image files (UMTS does "
+"this, for example). Skipping verification reduces the security of BOINC."
+msgstr "仅在你的互联网供应商会修改映像文件时(比如 UMTS 就会)才需要。跳过验证将降低 BOINC 的安全性。"
+
+msgid "Show comparison view"
+msgstr "显示对比视图"
+
+msgid "Resource settings"
+msgstr "资源设定"
+
+msgid "Resource share"
+msgstr "资源分享"
+
+msgid ""
+"Determines the proportion of your computer's resources allocated to this "
+"project. Example: if you participate in two BOINC projects with resource "
+"shares of 100 and 200, the first will get 1/3 of your resources and the "
+"second will get 2/3."
+msgstr "决定你的计算资源在该项目的投入比例。比如你分别在两个 BOINC 项目设置了 100 和 200 的资源分享值,则前一个项目将得到 1/3 的资源而第二个将得到 2/3。"
+
+msgid "Use CPU"
+msgstr "使用CPU"
+
+msgid "Use NVIDIA GPU"
+msgstr "使用NVIDIA GPU"
+
+msgid "Use ATI GPU"
+msgstr "使用ATI GPU"
+
+msgid "Use INTEL GPU"
+msgstr "使用 INTEL GPU"
+
+msgid "Beta settings"
+msgstr "Beta 设定"
+
+msgid "Run test applications?"
+msgstr "运行测试应用程序吗?"
+
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "这有助于我们开发应用程序,但可能会导致任务在您的计算机上运行失败"
+
+msgid "Default set"
+msgstr "缺省设定"
+
+msgid "Set used for new computers"
+msgstr "用于新计算机的设定"
+
+msgid "Merge"
+msgstr "合并"
+
+msgid "Delete"
+msgstr "删除"
+
+msgid ""
+"This will delete host @id from your account forever. Are you sure this is "
+"OK?"
+msgstr "将从你的账户永久删除主机 @id,确定要继续吗?"
+
+msgid "Mark all topics read"
+msgstr "标记所有主题已读"
+
+msgid "Mark all forums read"
+msgstr "标记所有讨论已读"
+
+msgid "Access denied. You must login to view this page."
+msgstr "访问被拒绝,你必须登录才能查看该页面。"
+
+msgid "You are not authorized to access this page."
+msgstr "你无权限访问该页面。"
+
+msgid "Disable rich-text"
+msgstr "禁用富文本"
+
+msgid "Enable rich-text"
+msgstr "启用富文本"
+
+msgid "View user profile."
+msgstr "查看用户档案"
+
+msgid "BBcode help"
+msgstr "BBcode 帮助"
+
+msgid "Post comment"
+msgstr "发表回复"
+
+msgid "No @type tasks"
+msgstr "没有 @type 类型的任务"
+
+msgid "Clear"
+msgstr "清除"
+
+msgid "These apply to all BOINC projects in which you participate."
+msgstr "这些参数设置对你参加的所有 BOINC 项目均有效。"
+
+msgid "Combined preferences"
+msgstr "横排的参数设置"
+
+msgid "every"
+msgstr "每"
+
+msgid "Edit"
+msgstr "编辑"
+
+msgid "Add"
+msgstr "添加"
+
+msgid "General settings"
+msgstr "一般设定"
+
+msgid "Time zone"
+msgstr "时区"
+
+msgid "Notification settings"
+msgstr "通知设定"
+
+msgid "Receive email notification for private messages?"
+msgstr "接收私人消息的邮件通知?"
+
+msgid "Receive email notification for friend requests?"
+msgstr "接收好友请求的邮件通知?"
+
+msgid "Language settings"
+msgstr "语言设定"
+
+msgid "Avatar settings"
+msgstr "头像设定"
+
+msgid "Create a profile"
+msgstr "创建一个用户档案"
+
+msgid "Upload an avatar"
+msgstr "上传一个新头像"
+
+msgid "Forum settings"
+msgstr "论坛设定"
+
+msgid "comments per page"
+msgstr "每页评论数"
+
+msgid "Newest post first"
+msgstr "发帖时间最新的在前面"
+
+msgid "Oldest post first"
+msgstr "发帖时间最旧的在前面"
+
+msgid "Signature"
+msgstr "签名"
+
+msgid "Privacy settings"
+msgstr "隐私设定"
+
+msgid "Hide"
+msgstr "隐藏"
+
+msgid "Hide this topic"
+msgstr "隐藏帖子"
+
+msgid "Lock"
+msgstr "锁定"
+
+msgid "Make sticky"
+msgstr "置顶"
+
+msgid "moderation"
+msgstr "仲裁"
+
+msgid "Post new comment"
+msgstr "发表新回复"
+
+msgid "Joined"
+msgstr "已加入"
+
+msgid "Credit"
+msgstr "积分"
+
+msgid "RAC"
+msgstr "近期平均积分"
+
+msgid "Join team"
+msgstr "加入团队"
+
+msgid "Join this team"
+msgstr "加入该团队"
+
+msgid "Manage team"
+msgstr "管理团队"
+
+msgid "View member list"
+msgstr "查看成员列表"
+
+msgid "Member names and emails"
+msgstr "成员名称和电子邮箱地址"
+
+msgid "View change history"
+msgstr "查看变更历史"
+
+msgid "See member activity"
+msgstr "查看成员活动"
+
+msgid "Manage team message board"
+msgstr "管理团队留言板"
+
+msgid "Create or manage message board"
+msgstr "创建或管理留言板"
+
+msgid "Remove members"
+msgstr "移除团队成员"
+
+msgid "Change founder"
+msgstr "更改团队创建人"
+
+msgid "Manage team admins"
+msgstr "管理团队管理员"
+
+msgid "Edit team info"
+msgstr "编辑团队信息"
+
+msgid "Remove team"
+msgstr "移除团队"
+
+msgid "Team forum"
+msgstr "团队论坛"
+
+msgid "Minimum total credit to post"
+msgstr "发贴要求的最低总积分"
+
+msgid "Change the team founder"
+msgstr "改变团队创建人"
+
+msgid "Team name"
+msgstr "团队名称"
+
+msgid "Type of team"
+msgstr "团队类型"
+
+msgid "Accept new members?"
+msgstr "是否接受新的团队成员?"
+
+msgid "Description of team"
+msgstr "团队描述"
+
+msgid "Create a team"
+msgstr "创建一个团队"
+
+msgid "Anonymous"
+msgstr "匿名"
+
+msgid "Recent average credit"
+msgstr "近期平均积分"
+
+msgid "Members"
+msgstr "成员"
+
+msgid "User ID"
+msgstr "用户 ID"
+
+msgid "User"
+msgstr "用户"
+
+msgid "Email Address"
+msgstr "电子邮件地址"
+
+msgid "URL"
+msgstr "网址"
+
+msgid "Computer ID"
+msgstr "计算机编号"
+
+msgid "Location"
+msgstr "位置"
+
+msgid "While BOINC running, % of time work is allowed"
+msgstr "当 BOINC 在运行时,允许计算的时间比例"
+
+msgid "Average turnaround time"
+msgstr "平均任务周转时间"
+
+msgid "Created"
+msgstr "创建时间"
+
+msgid "While BOINC running, % of time host has an Internet connection"
+msgstr "当 BOINC 在运行时,主机拥有互联网连接的时间比例"
+
+msgid "Average CPU efficiency"
+msgstr "平均的 CPU 运行效率"
+
+msgid "Total disk space"
+msgstr "总磁盘空间"
+
+msgid "Task duration correction factor"
+msgstr "任务时长校正因子"
+
+msgid "Avg. credit"
+msgstr "平均积分"
+
+msgid "External IP address"
+msgstr "外部 IP 地址"
+
+msgid "Cache"
+msgstr "缓存"
+
+msgid "Memory"
+msgstr "内存(RAM)"
+
+msgid "Swap space"
+msgstr "交换空间"
+
+msgid "Average download rate"
+msgstr "平均下载速度"
+
+msgid "Average upload rate"
+msgstr "平均上传速度"
+
+msgid "Operating system"
+msgstr "操作系统"
+
+msgid "Measured floating point speed"
+msgstr "浮点运算速度"
+
+msgid "Measured integer speed"
+msgstr "整数运算速度"
+
+msgid "Number of processors"
+msgstr "数据器数量"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Number of times client has contacted server"
+msgstr "客户端连接服务端的次数"
+
+msgid "Last contact"
+msgstr "最近一次通讯"
+
+msgid "Workunit ID"
+msgstr "任务单元 ID"
+
+msgid "Host ID"
+msgstr "主机 ID"
+
+msgid "Application version"
+msgstr "计算程序版本"
+
+msgid "Claimed credit"
+msgstr "申请积分"
+
+msgid "Client state"
+msgstr "客户端状态"
+
+msgid "CPU time"
+msgstr "已用 CPU 时间"
+
+msgid "Run time"
+msgstr "运行时间"
+
+msgid "Exit status"
+msgstr "退出状态"
+
+msgid "Outcome"
+msgstr "结果"
+
+msgid "Report deadline"
+msgstr "上报期限"
+
+msgid "Sent"
+msgstr "发送时间"
+
+msgid "Server state"
+msgstr "服务端状态"
+
+msgid "Computer"
+msgstr "计算机"
+
+msgid "Consecutive valid tasks"
+msgstr "连续成功完成的计算任务数目"
+
+msgid "Number of tasks completed"
+msgstr "完成的计算任务数目"
+
+msgid "Max tasks per day"
+msgstr "每日最大任务数量"
+
+msgid "Number of tasks today"
+msgstr "今天的任务数量"
+
+msgid "Show IP address"
+msgstr "显示 IP 地址"
+
+msgid "hours"
+msgstr "时"
+
+msgid "Add as friend"
+msgstr "添加为好友"
+
+msgid "Team"
+msgstr "团队"
+
+msgid "Reply"
+msgstr "回复"
+
+msgid "Quote"
+msgstr "引用"
+
+msgid "Details"
+msgstr "详细"
diff --git a/locale/zh_CN/BOINC-Manager.po b/locale/zh_CN/BOINC-Manager.po
index f1b757f1bf..40e4ddeaac 100644
--- a/locale/zh_CN/BOINC-Manager.po
+++ b/locale/zh_CN/BOINC-Manager.po
@@ -3,30 +3,31 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Yin Gang , 2015
# 周潇波 , 2015
# 秦赫阳 , 2015
msgid ""
msgstr ""
"Project-Id-Version: BOINC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-24 13:36-0500\n"
-"PO-Revision-Date: 2015-04-29 14:54+0000\n"
-"Last-Translator: 秦赫阳 \n"
+"POT-Creation-Date: 2015-04-30 14:53-0500\n"
+"PO-Revision-Date: 2015-05-01 00:58+0000\n"
+"Last-Translator: Yin Gang \n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/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"
+"X-Generator: Poedit 1.7.6\n"
"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-Poedit-Country: UNITED STATES\n"
-"X-Poedit-Language: English\n"
+"X-Poedit-KeywordsList: _\n"
"X-Poedit-SearchPath-0: clientgui\n"
"X-Poedit-SearchPath-1: clientgui\\common\n"
"X-Poedit-SearchPath-2: clientgui\\gtk\n"
-"X-Poedit-SearchPath-3: clientgui\\mac\n"
-"X-Poedit-SearchPath-4: clientgui\\msw\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-3: clientgui\\msw\n"
+"X-Poedit-SearchPath-4: clientgui\\mac\n"
+"X-Poedit-SourceCharset: UTF-8\n"
#: clientgui/AccountInfoPage.cpp:361
#, c-format
@@ -176,6 +177,8 @@ msgstr "打开网页"
msgid "Visit this account manager's web site"
msgstr "访问该账户管理器的网站"
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
#: clientgui/AccountManagerProcessingPage.cpp:186
#: clientgui/AccountManagerPropertiesPage.cpp:192
#, c-format
@@ -204,364 +207,369 @@ msgstr "已连接"
msgid "Disconnected"
msgstr "已断开"
-#: clientgui/AdvancedFrame.cpp:325
+#: clientgui/AdvancedFrame.cpp:327
#, c-format
msgid "New %s window..."
msgstr "新建 %s 窗口"
-#: clientgui/AdvancedFrame.cpp:329
+#: clientgui/AdvancedFrame.cpp:331
#, c-format
msgid "Open another %s window"
msgstr "打开另一个 %s 窗口"
-#: clientgui/AdvancedFrame.cpp:340
+#: clientgui/AdvancedFrame.cpp:342
msgid "Select computer..."
msgstr "选择计算机..."
-#: clientgui/AdvancedFrame.cpp:341
+#: clientgui/AdvancedFrame.cpp:343
msgid "Connect to a BOINC client on another computer"
msgstr "连接到另一台计算机上的 BOINC 客户端"
-#: clientgui/AdvancedFrame.cpp:345
+#: clientgui/AdvancedFrame.cpp:347
msgid "Shut down connected client..."
msgstr "关闭当前连接的客户端..."
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:348
msgid "Shut down the currently connected BOINC client"
msgstr "关闭当前连接到的 BOINC 客户端"
-#: clientgui/AdvancedFrame.cpp:351
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
#, c-format
msgid "Close the %s window"
msgstr "关闭 %s 窗口"
-#: clientgui/AdvancedFrame.cpp:354
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
msgid "&Close window"
msgstr "关闭窗口(&C)"
-#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
-#: clientgui/AdvancedFrame.cpp:373
+#: clientgui/AdvancedFrame.cpp:365 clientgui/AdvancedFrame.cpp:370
+#: clientgui/AdvancedFrame.cpp:375 clientgui/sg_BoincSimpleFrame.cpp:132
+#: clientgui/sg_BoincSimpleFrame.cpp:137
#, c-format
msgid "Exit %s"
msgstr "退出 %s"
-#: clientgui/AdvancedFrame.cpp:386
-msgid "Preferences…"
+#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+msgid "Preferences..."
msgstr "参数设置..."
-#: clientgui/AdvancedFrame.cpp:395
+#: clientgui/AdvancedFrame.cpp:398
msgid "&Notices\tCtrl+Shift+N"
msgstr "通知(&N)\tCtrl+Shift+N"
-#: clientgui/AdvancedFrame.cpp:396
+#: clientgui/AdvancedFrame.cpp:399
msgid "Show notices"
msgstr "显示通知"
-#: clientgui/AdvancedFrame.cpp:401
+#: clientgui/AdvancedFrame.cpp:404
msgid "&Projects\tCtrl+Shift+P"
msgstr "项目(&P)\tCtrl+Shift+P"
-#: clientgui/AdvancedFrame.cpp:402
+#: clientgui/AdvancedFrame.cpp:405
msgid "Show projects"
msgstr "显示项目"
-#: clientgui/AdvancedFrame.cpp:407
+#: clientgui/AdvancedFrame.cpp:410
msgid "&Tasks\tCtrl+Shift+T"
msgstr "任务(&T)\tCtrl+Shift+T"
-#: clientgui/AdvancedFrame.cpp:408
+#: clientgui/AdvancedFrame.cpp:411
msgid "Show tasks"
msgstr "显示任务"
-#: clientgui/AdvancedFrame.cpp:413
+#: clientgui/AdvancedFrame.cpp:416
msgid "Trans&fers\tCtrl+Shift+X"
msgstr "网络传输(&F)\tCtrl+Shift+X"
-#: clientgui/AdvancedFrame.cpp:414
+#: clientgui/AdvancedFrame.cpp:417
msgid "Show file transfers"
msgstr "显示文件传输"
-#: clientgui/AdvancedFrame.cpp:419
+#: clientgui/AdvancedFrame.cpp:422
msgid "&Statistics\tCtrl+Shift+S"
msgstr "统计(&S)\tCtrl+Shift+S"
-#: clientgui/AdvancedFrame.cpp:420
+#: clientgui/AdvancedFrame.cpp:423
msgid "Show statistics"
msgstr "显示统计信息"
-#: clientgui/AdvancedFrame.cpp:425
+#: clientgui/AdvancedFrame.cpp:428
msgid "&Disk\tCtrl+Shift+D"
msgstr "磁盘(&D)\tCtrl+Shift+D"
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:429
msgid "Show disk usage"
msgstr "显示磁盘使用情况"
-#: clientgui/AdvancedFrame.cpp:432
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "事件日志...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:433
-msgid "Show diagnostic messages"
-msgstr "显示诊断消息"
-
-#: clientgui/AdvancedFrame.cpp:439
+#: clientgui/AdvancedFrame.cpp:436
msgid "Simple &View...\tCtrl+Shift+V"
msgstr "简易视图(&V)...\tCtrl+Shift+V"
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:437
msgid "Switch to the Simple View"
msgstr "切换到简易视图"
-#: clientgui/AdvancedFrame.cpp:454
-msgid "&Add project or account manager..."
-msgstr "增加项目或帐户管理器(&A)..."
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
+msgstr "增加项目(&A)..."
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "添加一个新的科学项目,或使用帐户管理器"
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "增加一个项目"
-#: clientgui/AdvancedFrame.cpp:459
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "使用账户管理器(&U)..."
+
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "使用账户管理器来控制该计算机。"
+
+#: clientgui/AdvancedFrame.cpp:461
#, c-format
msgid "&Synchronize with %s"
msgstr "与 %s 进行同步(&S)"
-#: clientgui/AdvancedFrame.cpp:463
+#: clientgui/AdvancedFrame.cpp:465
#, c-format
msgid "Get current settings from %s"
msgstr "从 %s 获取当前的参数设定"
-#: clientgui/AdvancedFrame.cpp:473
-msgid "&Add project..."
-msgstr "增加项目(&A)..."
-
-#: clientgui/AdvancedFrame.cpp:474
-msgid "Add a project"
-msgstr "增加一个项目"
-
-#: clientgui/AdvancedFrame.cpp:477
+#: clientgui/AdvancedFrame.cpp:479
#, c-format
msgid "S&top using %s..."
msgstr "停止使用 %s(&S)"
-#: clientgui/AdvancedFrame.cpp:483
+#: clientgui/AdvancedFrame.cpp:485
msgid "Remove this computer from account manager control."
msgstr "从帐户管理器中移除当前计算机。"
-#: clientgui/AdvancedFrame.cpp:489
+#: clientgui/AdvancedFrame.cpp:491
msgid "Run CPU &benchmarks"
msgstr "运行 CPU 基准测试(&B)"
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:492
msgid "Run tests that measure CPU speed"
msgstr "运行测试以测量 CPU 速度"
-#: clientgui/AdvancedFrame.cpp:494
+#: clientgui/AdvancedFrame.cpp:496
msgid "Retry pending transfers"
msgstr "重新尝试被挂起的传输"
-#: clientgui/AdvancedFrame.cpp:495
+#: clientgui/AdvancedFrame.cpp:497
msgid "Retry deferred file transfers and task requests"
msgstr "重新尝试被延迟的文件传输和任务请求"
+#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "事件日志...\tCtrl+Shift+E"
+
#: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr "显示诊断消息"
+
+#: clientgui/AdvancedFrame.cpp:511
msgid "&Run always"
msgstr "一直运行(&R)"
-#: clientgui/AdvancedFrame.cpp:504
+#: clientgui/AdvancedFrame.cpp:512
msgid "Allow work regardless of preferences"
msgstr "运行计算程序且不受参数设置的影响"
-#: clientgui/AdvancedFrame.cpp:508
+#: clientgui/AdvancedFrame.cpp:516
msgid "Run based on &preferences"
msgstr "依照参数运行(&P)"
-#: clientgui/AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:517
msgid "Allow work according to preferences"
msgstr "运行计算程序且依照用户的参数设置"
-#: clientgui/AdvancedFrame.cpp:513
+#: clientgui/AdvancedFrame.cpp:521
msgid "&Suspend"
msgstr "暂停(&S)"
-#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/AdvancedFrame.cpp:522
msgid "Stop work regardless of preferences"
msgstr "暂停计算程序且不受参数设置的影响"
-#: clientgui/AdvancedFrame.cpp:539
+#: clientgui/AdvancedFrame.cpp:547
msgid "Use GPU always"
msgstr "总是使用 GPU"
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:548
msgid "Allow GPU work regardless of preferences"
msgstr "使用 GPU 且不受参数设置的影响"
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:552
msgid "Use GPU based on preferences"
msgstr "依照参数使用 GPU"
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:553
msgid "Allow GPU work according to preferences"
msgstr "运行 GPU 计算程序且依照用户的参数设置"
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:557
msgid "Suspend GPU"
msgstr "暂停 GPU"
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:558
msgid "Stop GPU work regardless of preferences"
msgstr "暂停使用 GPU 且不受参数设置的影响"
-#: clientgui/AdvancedFrame.cpp:574
+#: clientgui/AdvancedFrame.cpp:582
msgid "Network activity always allowed"
msgstr "总是允许网络活动"
-#: clientgui/AdvancedFrame.cpp:575
+#: clientgui/AdvancedFrame.cpp:583
msgid "Allow network activity regardless of preferences"
msgstr "允许使用网络且不受参数设置的影响"
-#: clientgui/AdvancedFrame.cpp:579
+#: clientgui/AdvancedFrame.cpp:587
msgid "Network activity based on preferences"
msgstr "依照参数使用网络"
-#: clientgui/AdvancedFrame.cpp:580
+#: clientgui/AdvancedFrame.cpp:588
msgid "Allow network activity according to preferences"
msgstr "允许使用网络且依照用户的参数设置"
-#: clientgui/AdvancedFrame.cpp:584
+#: clientgui/AdvancedFrame.cpp:592
msgid "Network activity suspended"
msgstr "暂停使用网络"
-#: clientgui/AdvancedFrame.cpp:585
+#: clientgui/AdvancedFrame.cpp:593
msgid "Stop BOINC network activity"
msgstr "暂停使用网络且不受参数设置的影响"
-#: clientgui/AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
msgid "Computing &preferences..."
msgstr "计算参数设置(&P)..."
-#: clientgui/AdvancedFrame.cpp:595
+#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
msgid "Configure computing preferences"
msgstr "修改计算参数设置"
-#: clientgui/AdvancedFrame.cpp:600
+#: clientgui/AdvancedFrame.cpp:608
msgid "Exclusive applications..."
msgstr "互斥应用程序..."
-#: clientgui/AdvancedFrame.cpp:601
+#: clientgui/AdvancedFrame.cpp:609
msgid "Configure exclusive applications"
msgstr "设置互斥应用程序"
-#: clientgui/AdvancedFrame.cpp:606
+#: clientgui/AdvancedFrame.cpp:614
msgid "Select columns..."
msgstr "选择列..."
-#: clientgui/AdvancedFrame.cpp:607
+#: clientgui/AdvancedFrame.cpp:615
msgid "Select which columns to display"
msgstr "选择要显示的列"
-#: clientgui/AdvancedFrame.cpp:611
+#: clientgui/AdvancedFrame.cpp:619
msgid "Event Log options...\tCtrl+Shift+F"
msgstr "事件日志选项...\tCtrl+Shift+F"
-#: clientgui/AdvancedFrame.cpp:612
+#: clientgui/AdvancedFrame.cpp:620
msgid "Enable or disable various diagnostic messages"
msgstr "启用或禁用各种诊断信息"
-#: clientgui/AdvancedFrame.cpp:616
+#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
msgid "&Other options..."
msgstr "(&O)其他选项..."
-#: clientgui/AdvancedFrame.cpp:617
+#: clientgui/AdvancedFrame.cpp:625
msgid "Configure display options and network settings"
msgstr "设置显示选项和网络设置"
-#: clientgui/AdvancedFrame.cpp:622
+#: clientgui/AdvancedFrame.cpp:630
msgid "Read config files"
msgstr "读取配置文件"
-#: clientgui/AdvancedFrame.cpp:623
+#: clientgui/AdvancedFrame.cpp:631
msgid ""
"Read configuration info from cc_config.xml and any app_config.xml files"
msgstr "从 cc_config.xml 和 app_config.xml 中读取配置信息"
-#: clientgui/AdvancedFrame.cpp:627
+#: clientgui/AdvancedFrame.cpp:635
msgid "Read local prefs file"
msgstr "读取本地参数设置文件"
-#: clientgui/AdvancedFrame.cpp:628
+#: clientgui/AdvancedFrame.cpp:636
msgid "Read preferences from global_prefs_override.xml."
msgstr "从 global_prefs_override.xml 中读取本地参数设置。"
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
#, c-format
msgid "%s &help"
msgstr "%s 帮助(&H)"
-#: clientgui/AdvancedFrame.cpp:640
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
#, c-format
msgid "Show information about %s"
msgstr "查看 %s 的信息"
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:658
#, c-format
msgid "&%s help"
msgstr "%s 帮助"
-#: clientgui/AdvancedFrame.cpp:654
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
#, c-format
msgid "Show information about the %s"
msgstr "查看 %s 的信息"
-#: clientgui/AdvancedFrame.cpp:665
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
#, c-format
msgid "%s &web site"
msgstr "%s 网站(&W)"
-#: clientgui/AdvancedFrame.cpp:669
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
#, c-format
msgid "Show information about BOINC and %s"
msgstr "查看 BOINC 和 %s 的信息"
-#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:688 clientgui/BOINCTaskBar.cpp:544
+#: clientgui/sg_BoincSimpleFrame.cpp:262
#, c-format
msgid "&About %s..."
msgstr "关于 %s (&A)..."
-#: clientgui/AdvancedFrame.cpp:686
+#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
msgid "Licensing and copyright information."
msgstr "查看许可与版权信息。"
-#: clientgui/AdvancedFrame.cpp:693
+#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
msgid "&File"
msgstr "文件(&F)"
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
msgid "&View"
msgstr "视图(&V)"
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:709
msgid "&Activity"
msgstr "活动(&A)"
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
msgid "&Options"
msgstr "选项(&O)"
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
msgid "&Tools"
msgstr "工具(&T)"
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
msgid "&Help"
msgstr "帮助(&H)"
-#: clientgui/AdvancedFrame.cpp:1188
+#: clientgui/AdvancedFrame.cpp:1235
#, c-format
msgid "%s - Stop using %s"
msgstr "%s - 停止使用 %s"
-#: clientgui/AdvancedFrame.cpp:1193
+#: clientgui/AdvancedFrame.cpp:1240
#, c-format
msgid ""
"If you stop using %s,\n"
@@ -571,39 +579,39 @@ msgid ""
"Do you want to stop using %s?"
msgstr "如果您退出 %s,\n您当前所有的计算项目将会保留,\n但您将必须手动对它们进行管理。\n\n您确定要退出 %s 吗?"
-#: clientgui/AdvancedFrame.cpp:1420
+#: clientgui/AdvancedFrame.cpp:1469
#, c-format
msgid "%s - Shut down the current client..."
msgstr "%s - 关闭当前连接的客户端..."
-#: clientgui/AdvancedFrame.cpp:1429
+#: clientgui/AdvancedFrame.cpp:1478
#, 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:1832
+#: clientgui/AdvancedFrame.cpp:1881 clientgui/DlgAbout.cpp:119
#, c-format
msgid "%s"
msgstr "%s"
-#: clientgui/AdvancedFrame.cpp:1841
+#: clientgui/AdvancedFrame.cpp:1890
#, c-format
msgid "%s has successfully added %s"
msgstr "%s 已经成功地加入了 %s"
-#: clientgui/AdvancedFrame.cpp:1977
+#: clientgui/AdvancedFrame.cpp:2026
#, c-format
msgid "%s - (%s)"
msgstr "%s - (%s)"
-#: clientgui/AdvancedFrame.cpp:1981
+#: clientgui/AdvancedFrame.cpp:2030
#, c-format
msgid "Connecting to %s"
msgstr "正在连接至 %s"
-#: clientgui/AdvancedFrame.cpp:1984
+#: clientgui/AdvancedFrame.cpp:2033
#, c-format
msgid "Connected to %s (%s)"
msgstr "已连接至 %s ( %s )"
@@ -651,7 +659,15 @@ msgstr "退出 %s (&X)"
msgid "%s - Communication"
msgstr "%s - 网络通讯"
-#: clientgui/AsyncRPC.cpp:1056
+#. m_btnClear = new wxButton( this, ID_SGPREFERENCESCLEAR, _("Clear"),
+#. wxDefaultPosition, wxDefaultSize, 0 );
+#. m_btnClear->SetToolTip( _("Clear all local preferences listed above and
+#. close the dialog") );
+#. itemBoxSizer44->Add(m_btnClear, 0, wxALIGN_CENTER_VERTICAL|wxALL,
+#. ADJUSTFORXDPI(5));
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:361
msgid "Cancel"
msgstr "取消"
@@ -724,6 +740,7 @@ msgid ""
"To connect up to your local computer please use 'localhost' as the host name."
msgstr "%s 当前未连接至任何 %s 客户端。\n请使用菜单中的'高级\\选择计算机...'以连接至一个 %s 客户端。\n如果要连接至您的本地计算机,请在主机名称中填入'localhost'。"
+#. Create the web sites task group
#: clientgui/BOINCBaseView.cpp:790
msgid "Project web pages"
msgstr "项目网页"
@@ -808,7 +825,8 @@ msgstr "%s 相关的本地用户权限设置有误,请重新安装 %s。\n(
msgid " at "
msgstr " 位置 "
-#: clientgui/BOINCGUIApp.cpp:612
+#: clientgui/BOINCGUIApp.cpp:612 clientgui/MainDocument.cpp:2494
+#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
msgid ")"
msgstr ")"
@@ -818,7 +836,7 @@ msgid ""
"Please reboot your computer and try again."
msgstr "BOINC 需要在计算机重新启动后才能正常运行。\n请您先重启计算机再重试当前的操作。"
-#: clientgui/BOINCGUIApp.cpp:643
+#: clientgui/BOINCGUIApp.cpp:643 clientgui/DlgAbout.cpp:153
msgid "BOINC Manager"
msgstr "BOINC Manager"
@@ -870,6 +888,7 @@ msgstr "允许运行多个 BOINC Manager 的实例"
msgid "Not used: workaround for bug in XCode 4.2"
msgstr "未使用:用于临时修复 XCode 4.2 的错误"
+#. These are just special tags so deal with them in a special way
#: clientgui/BOINCGUIApp.cpp:1166
msgid "(Automatic Detection)"
msgstr "( 自动检测 )"
@@ -892,13 +911,13 @@ msgstr "打开 %s 的网站..."
msgid "Open %s..."
msgstr "打开 %s..."
-#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:634
+#: clientgui/BOINCTaskBar.cpp:639
msgid "Snooze"
msgstr "休息一下"
-#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:658
msgid "Snooze GPU"
msgstr "让 GPU 休息一下"
@@ -906,52 +925,55 @@ msgstr "让 GPU 休息一下"
msgid "E&xit"
msgstr "退出(&X)"
-#: clientgui/BOINCTaskBar.cpp:626
+#: clientgui/BOINCTaskBar.cpp:629 clientgui/ViewProjects.cpp:798
+#: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
+#: clientgui/sg_ProjectCommandPopup.cpp:125
+#: clientgui/sg_TaskCommandPopup.cpp:118
msgid "Resume"
msgstr "继续"
-#: clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:649
msgid "Resume GPU"
msgstr "继续 GPU 计算"
-#: clientgui/BOINCTaskBar.cpp:727
+#: clientgui/BOINCTaskBar.cpp:715
msgid "Computing is enabled"
msgstr "计算已启用"
-#: clientgui/BOINCTaskBar.cpp:731
+#: clientgui/BOINCTaskBar.cpp:719
msgid "Computing is suspended - "
msgstr "计算已暂停 - "
-#: clientgui/BOINCTaskBar.cpp:741
+#: clientgui/BOINCTaskBar.cpp:729
msgid "GPU computing is enabled"
msgstr "GPU 计算已启用"
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:732
msgid "GPU computing is suspended - "
msgstr "GPU 计算已暂停 - "
-#: clientgui/BOINCTaskBar.cpp:753
+#: clientgui/BOINCTaskBar.cpp:741
msgid "Network is enabled"
msgstr "网络已启用"
-#: clientgui/BOINCTaskBar.cpp:756
+#: clientgui/BOINCTaskBar.cpp:744
msgid "Network is suspended - "
msgstr "网络已暂停 - "
-#: clientgui/BOINCTaskBar.cpp:764
+#: clientgui/BOINCTaskBar.cpp:752
msgid "Reconnecting to client."
msgstr "正在重新连接至客户端。"
-#: clientgui/BOINCTaskBar.cpp:766
+#: clientgui/BOINCTaskBar.cpp:754
msgid "Not connected to a client."
msgstr "当前没有连接到任何客户端。"
-#: clientgui/BOINCTaskBar.cpp:819
+#: clientgui/BOINCTaskBar.cpp:807
#, c-format
msgid "%s Notices"
msgstr "%s 通知"
-#: clientgui/BOINCTaskBar.cpp:825
+#: clientgui/BOINCTaskBar.cpp:813
msgid "There are new notices - click to view."
msgstr "有新的通知 - 点击查看。"
@@ -1010,6 +1032,7 @@ msgstr "从 %s 的更新已完成。"
msgid "Update completed."
msgstr "更新已完成。"
+#. Attach Completed
#: clientgui/CompletionPage.cpp:247
msgid "Now using account manager"
msgstr "当前正在使用帐户管理器"
@@ -1069,35 +1092,39 @@ msgstr "以获取更多的信息。"
msgid "&OK"
msgstr "确定(&O)"
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:779
msgid "Invalid number"
msgstr "无效的数字"
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:780
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:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:781
+msgid "Start time must be different from end time"
+msgstr "起始时间必须和结束时间不同"
+
+#: clientgui/DlgAdvPreferences.cpp:685
msgid "Number must be between 0 and 10"
msgstr "必须是0到10之间的数字"
-#: clientgui/DlgAdvPreferences.cpp:672
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:782
msgid "Number must be between 0 and 100"
msgstr "数字必须介于 0 和 100 之间"
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:853
msgid "invalid input value detected"
msgstr "检测到错误的输入值"
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:855
msgid "Validation Error"
msgstr "验证错误"
-#: clientgui/DlgAdvPreferences.cpp:1119
+#: clientgui/DlgAdvPreferences.cpp:1158
msgid "Discard local preferences and use web-based preferences?"
msgstr "放弃本地首选项并使用网上的首选项吗?"
-#: clientgui/DlgAdvPreferences.cpp:1120
+#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1181
msgid "Confirmation"
msgstr "确认"
@@ -1106,106 +1133,112 @@ msgstr "确认"
msgid "%s - Computing preferences"
msgstr "%s -计算参数设置"
-#: clientgui/DlgAdvPreferencesBase.cpp:77
+#: clientgui/DlgAdvPreferencesBase.cpp:82 clientgui/sg_DlgPreferences.cpp:161
msgid ""
"Using local preferences.\n"
"Click \"Use web prefs\" to use web-based preferences from"
msgstr "使用本地首选项。\n单击\"使用 web 首选项\"可使用来自下列网站的首选项"
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
msgid "Using web-based preferences from"
msgstr "使用来自下列网站的首选项"
-#: clientgui/DlgAdvPreferencesBase.cpp:102
+#: clientgui/DlgAdvPreferencesBase.cpp:107 clientgui/sg_DlgPreferences.cpp:187
msgid "Set values and click OK to use local preferences instead."
msgstr "设置数值,并单击确定以改用本地首选项。"
-#: clientgui/DlgAdvPreferencesBase.cpp:111
+#: 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点击“确定”即可保存并应用对话框中的相关设置。\n点击“清除”即可恢复使用项目网站上的参数设置。"
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: clientgui/DlgAdvPreferencesBase.cpp:119
msgid "Clear"
msgstr "清除"
-#: clientgui/DlgAdvPreferencesBase.cpp:115
+#: clientgui/DlgAdvPreferencesBase.cpp:120
msgid "Clear all local preferences and close the dialog."
msgstr "清除所有本地的参数设置并关闭对话框"
-#: clientgui/DlgAdvPreferencesBase.cpp:118
+#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:216
msgid "Use web prefs"
msgstr "使用项目网站上的设置"
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:217
msgid "Restore web-based preferences and close the dialog."
msgstr "恢复使用项目网站上的参数设置并关闭对话框"
-#: clientgui/DlgAdvPreferencesBase.cpp:143
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#. Computing schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:148
+#: clientgui/DlgAdvPreferencesBase.cpp:643
msgid "Computing"
msgstr "正在计算"
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:791
msgid "Network"
msgstr "网络"
-#: clientgui/DlgAdvPreferencesBase.cpp:149
+#: clientgui/DlgAdvPreferencesBase.cpp:154
msgid "Disk and memory"
msgstr "磁盘和内存"
-#: clientgui/DlgAdvPreferencesBase.cpp:152
+#: clientgui/DlgAdvPreferencesBase.cpp:157
msgid "Daily schedules"
msgstr "每日计划"
-#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgAdvPreferencesBase.cpp:170
#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
-#: clientgui/DlgHiddenColumns.cpp:100
+#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:352
msgid "OK"
msgstr "确定"
-#: clientgui/DlgAdvPreferencesBase.cpp:166
+#: clientgui/DlgAdvPreferencesBase.cpp:171
msgid "Save all values and close the dialog."
msgstr "保存所有参数值并关闭对话框"
-#: clientgui/DlgAdvPreferencesBase.cpp:172
+#: clientgui/DlgAdvPreferencesBase.cpp:177
msgid "Close the dialog without saving."
msgstr "放弃更改并关闭对话框"
-#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+#: clientgui/DlgAdvPreferencesBase.cpp:181 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:367
msgid "Help"
msgstr "帮助"
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:182
msgid "Shows the preferences web page."
msgstr "显示参数设置网页"
-#: clientgui/DlgAdvPreferencesBase.cpp:239
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:431
msgid "Usage limits"
msgstr "使用率限制"
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#. Test Comment
+#: clientgui/DlgAdvPreferencesBase.cpp:250
#, 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:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:252
+#: clientgui/DlgAdvPreferencesBase.cpp:264 clientgui/sg_DlgPreferences.cpp:307
msgid "Use at most"
msgstr "最多使用"
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:257
#, no-c-format
msgid "% of the CPUs"
msgstr "%的CPU"
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:262 clientgui/sg_DlgPreferences.cpp:305
#, no-c-format
msgid ""
"Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1213,342 +1246,345 @@ msgid ""
"and repeat."
msgstr "每隔几秒钟就暂停一下然后恢复计算,以降低CPU温度并减少电能使用。比如:75%意味着每计算 3 秒就暂停 1 秒,然后如此重复。"
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:269 clientgui/sg_DlgPreferences.cpp:312
#, no-c-format
msgid "% of CPU time"
msgstr "% 的处理器时间"
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:276
msgid "When to suspend"
msgstr "以下情况暂停计算"
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:282 clientgui/sg_DlgPreferences.cpp:242
msgid "Suspend when computer is on battery"
msgstr "当计算机正在使用电池供电时暂停计算"
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:285 clientgui/sg_DlgPreferences.cpp:238
msgid ""
"Check this to suspend computing on portables when running on battery power."
msgstr "勾选这个选项以使得笔记本电脑在靠电池电源运行时暂停计算。"
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:291 clientgui/sg_DlgPreferences.cpp:256
msgid "Suspend when computer is in use"
msgstr "当计算机正在使用时暂停计算"
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:294 clientgui/sg_DlgPreferences.cpp:252
msgid ""
"Check this to suspend computing and file transfers when you're using the "
"computer."
msgstr "勾选这个选项以使得当您使用计算机时暂停计算和文件传输。"
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:300
msgid "Suspend GPU computing when computer is in use"
msgstr "当使用计算机时暂停 GPU 计算"
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:303
msgid "Check this to suspend GPU computing when you're using the computer."
msgstr "勾选这个选项以使得当您使用计算机时暂停GPU计算。"
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:308 clientgui/sg_DlgPreferences.cpp:267
msgid "This determines when the computer is considered 'in use'."
msgstr "这将确定在怎样的情况下计算机会被视为“正在使用”。"
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:271
msgid "'In use' means mouse/keyboard input in last"
msgstr "如果在最近的多少分钟内有鼠标或键盘操作则认为计算机在使用中"
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#: clientgui/DlgAdvPreferencesBase.cpp:320
+#: clientgui/DlgAdvPreferencesBase.cpp:393 clientgui/sg_DlgPreferences.cpp:279
msgid "minutes"
msgstr "分钟"
-#: clientgui/DlgAdvPreferencesBase.cpp:321
+#: clientgui/DlgAdvPreferencesBase.cpp:327
#, c-format
msgid "Suspend when non-%s CPU usage is above"
msgstr "当非%s CPU使用率高于多少时暂停"
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:329
msgid "Suspend computing when your computer is busy running other programs."
msgstr "当您的计算机正忙于运行其他程序时暂停计算。"
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#: clientgui/DlgAdvPreferencesBase.cpp:350
+#: clientgui/DlgAdvPreferencesBase.cpp:480
msgid "Other"
msgstr "其它"
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:355
msgid "Store at least enough tasks to keep the computer busy for this long."
msgstr "存储至少足够使计算机计算如此长时间的任务。"
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#: clientgui/DlgAdvPreferencesBase.cpp:358
msgid "Store at least"
msgstr "至少存储"
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#: clientgui/DlgAdvPreferencesBase.cpp:366
+#: clientgui/DlgAdvPreferencesBase.cpp:382
msgid "days of work"
msgstr "天的工作"
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:371
msgid ""
"Store additional tasks above the minimum level. Determines how much work is"
" requested when contacting a project."
msgstr "在最低限度之上额外存储一些任务。这将决定BOINC客户端在联系一个项目时要求多少新任务。"
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#: clientgui/DlgAdvPreferencesBase.cpp:374
msgid "Store up to an additional"
msgstr "额外存储"
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:387
#, c-format
msgid "If you run several projects, %s may switch between them this often."
msgstr "如果您同时运行几个项目,%s 将每隔这么长时间切换一次任务。"
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#: clientgui/DlgAdvPreferencesBase.cpp:389
msgid "Switch between tasks every"
msgstr "每隔多少分钟切换任务"
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:397
msgid ""
"This controls how often tasks save their state to disk, so that they can be "
"restarted later."
msgstr "这个选项决定计算任务向磁盘保存其进度的频繁程度,以便于之后重新启动。"
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#: clientgui/DlgAdvPreferencesBase.cpp:398
msgid "Request tasks to checkpoint at most every"
msgstr "要求任务每隔多少分钟储存一次进度"
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#: clientgui/DlgAdvPreferencesBase.cpp:402
msgid "seconds"
msgstr "秒"
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:437
msgid "Limit the download rate of file transfers."
msgstr "限制文件传输的下载速率。"
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:438
msgid "Limit download rate to"
msgstr "限制下载速度为"
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:442
+#: clientgui/DlgAdvPreferencesBase.cpp:451
msgid "KB/second"
msgstr "KB每秒"
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:446
msgid "Limit the upload rate of file transfers."
msgstr "限制文件传输的上传速率。"
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:447
msgid "Limit upload rate to"
msgstr "限制上传速率为"
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:458
#, c-format
msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
msgstr "例如: 限制%s在30天内最多传输2000 MB数据。"
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:460
msgid "Limit usage to"
msgstr "限制使用量为"
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:464
msgid "MB every"
msgstr "MB 每"
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:468
msgid "days"
msgstr "天"
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:485
#, c-format
msgid ""
"Check this only if your Internet provider modifies image files. Skipping "
"verification reduces the security of %s."
msgstr "仅当您的Internet提供商会修改图像文件的情况下才需要选中此选项。跳过验证会降低%s的安全性。"
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:487
msgid "Skip data verification for image files"
msgstr "跳过图像文件的数据校验"
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:491
msgid "Confirm before connecting to Internet"
msgstr "接入互联网前先确认"
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:492
+#: clientgui/DlgAdvPreferencesBase.cpp:496
msgid "Useful only if you have a modem, ISDN or VPN connection."
msgstr "仅 Modem、ISDN 和 VPN 用户需要使用该设置"
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:495
msgid "Disconnect when done"
msgstr "传输完成后断开连接"
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:522 clientgui/ViewResources.cpp:116
msgid "Disk"
msgstr "磁盘"
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:527
#, c-format
msgid "%s will use the most restrictive of these settings:"
msgstr "%s 将使用这些设置中最严格的设置:"
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:533 clientgui/sg_DlgPreferences.cpp:334
#, c-format
msgid "Limit the total amount of disk space used by %s."
msgstr "限制%s使用的磁盘空间总量。"
-#: clientgui/DlgAdvPreferencesBase.cpp:530
-#: clientgui/DlgAdvPreferencesBase.cpp:554
+#: clientgui/DlgAdvPreferencesBase.cpp:536
+#: clientgui/DlgAdvPreferencesBase.cpp:560 clientgui/sg_DlgPreferences.cpp:337
msgid "Use no more than"
msgstr "最多使用"
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:540
msgid "GB"
msgstr "GB"
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:545
#, c-format
msgid ""
"Limit disk usage to leave this much free space on the volume where %s stores"
" data."
msgstr "限制%s的磁盘使用,在存储数据的卷上保留如下数量的空闲空间。"
-#: clientgui/DlgAdvPreferencesBase.cpp:542
+#: clientgui/DlgAdvPreferencesBase.cpp:548
msgid "Leave at least"
msgstr "至少保留"
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:552
msgid "GB free"
msgstr "GB可用空间"
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:557
#, c-format
msgid ""
"Limit the percentage of disk space used by %s on the volume where it stores "
"data."
msgstr "限制%s在存储数据的卷上使用的磁盘空间的百分比。"
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: clientgui/DlgAdvPreferencesBase.cpp:565
#, no-c-format
msgid "% of total"
msgstr "%"
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:572
msgid "Memory"
msgstr "内存(RAM)"
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:577
#, c-format
msgid "Limit the memory used by %s when you're using the computer."
msgstr "限制当您使用计算机时%s 使用的内存。"
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:579
msgid "When computer is in use, use at most"
msgstr "当计算机在使用时,最多使用"
-#: clientgui/DlgAdvPreferencesBase.cpp:579
-#: clientgui/DlgAdvPreferencesBase.cpp:591
-#: clientgui/DlgAdvPreferencesBase.cpp:607
+#: clientgui/DlgAdvPreferencesBase.cpp:585
+#: clientgui/DlgAdvPreferencesBase.cpp:597
+#: clientgui/DlgAdvPreferencesBase.cpp:613
#, no-c-format
msgid "%"
msgstr "%"
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:590
#, c-format
msgid "Limit the memory used by %s when you're not using the computer."
msgstr "限制当您未使用计算机时%s 使用的内存。"
-#: clientgui/DlgAdvPreferencesBase.cpp:586
+#: clientgui/DlgAdvPreferencesBase.cpp:592
msgid "When computer is not in use, use at most"
msgstr "当计算机未在使用时,最多使用"
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:601
msgid "Leave non-GPU tasks in memory while suspended"
msgstr "在暂停时将非GPU任务留在内存中"
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:602
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:600
+#: clientgui/DlgAdvPreferencesBase.cpp:606
#, c-format
msgid "Limit the swap space (page file) used by %s."
msgstr "限制 %s 使用的交换空间 (页面文件)大小。"
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:608
msgid "Page/swap file: use at most"
msgstr "虚拟内存:最多使用"
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:633 clientgui/sg_DlgPreferences.cpp:284
msgid "and"
msgstr "到"
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:634
msgid "to"
msgstr "至"
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:647 clientgui/sg_DlgPreferences.cpp:286
msgid "Compute only during a particular period each day."
msgstr "仅在每天的特定时间段内计算。"
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:650 clientgui/sg_DlgPreferences.cpp:289
msgid "Compute only between"
msgstr "仅在如下时间段内计算。"
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:660
+#: clientgui/DlgAdvPreferencesBase.cpp:807
msgid "Day-of-week override"
msgstr "自定义每周内各天的可用时间段:"
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:664
+#: clientgui/DlgAdvPreferencesBase.cpp:811
msgid "Override the times above on the selected days:"
msgstr "在一周选定的各天自定义上述时间设置"
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:682
+#: clientgui/DlgAdvPreferencesBase.cpp:828
msgid "Monday"
msgstr "周一"
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:697
+#: clientgui/DlgAdvPreferencesBase.cpp:843
msgid "Friday"
msgstr "周五"
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:710
+#: clientgui/DlgAdvPreferencesBase.cpp:856
msgid "Tuesday"
msgstr "周二"
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:725
+#: clientgui/DlgAdvPreferencesBase.cpp:871
msgid "Saturday"
msgstr "周六"
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:738
+#: clientgui/DlgAdvPreferencesBase.cpp:884
msgid "Wednesday"
msgstr "周三"
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:753
+#: clientgui/DlgAdvPreferencesBase.cpp:899
msgid "Sunday"
msgstr "周日"
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:766
+#: clientgui/DlgAdvPreferencesBase.cpp:912
msgid "Thursday"
msgstr "周四"
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:795 clientgui/sg_DlgPreferences.cpp:316
msgid "Transfer files only during a particular period each day."
msgstr "仅在每天的特定时间段内传输文件。"
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:797 clientgui/sg_DlgPreferences.cpp:318
msgid "Transfer files only between"
msgstr "传输文件的时间段:"
@@ -1587,15 +1623,19 @@ msgstr "放弃更改并关闭对话框"
msgid "%s - Event Log"
msgstr "%s - 事件日志"
-#: clientgui/DlgEventLog.cpp:237
+#. Create List Pane Items
+#: clientgui/DlgEventLog.cpp:237 clientgui/ViewMessages.cpp:117
+#: clientgui/ViewProjects.cpp:245 clientgui/ViewStatistics.cpp:411
+#: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
+#: clientgui/ViewWork.cpp:260
msgid "Project"
msgstr "项目"
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
msgid "Time"
msgstr "时间"
-#: clientgui/DlgEventLog.cpp:239
+#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
msgid "Message"
msgstr "消息"
@@ -1608,6 +1648,7 @@ msgid "Copy &All"
msgstr "复制所有的(&A)"
#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
msgid "Copy all the messages to the clipboard."
msgstr "复制所有消息至剪贴板。"
@@ -1616,6 +1657,7 @@ msgid "Copy &Selected"
msgstr "复制选中的(&S)"
#: clientgui/DlgEventLog.cpp:319 clientgui/DlgEventLog.cpp:327
+#: clientgui/ViewMessages.cpp:97
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or command key while clicking on "
@@ -1623,6 +1665,7 @@ msgid ""
msgstr "复制选中的消息至剪贴板。您可以在选择的时候通过按住Shift键或Commandl键来选取多条消息。"
#: clientgui/DlgEventLog.cpp:321 clientgui/DlgEventLog.cpp:329
+#: clientgui/ViewMessages.cpp:99
msgid ""
"Copy the selected messages to the clipboard. You can select multiple "
"messages by holding down the shift or control key while clicking on "
@@ -1664,6 +1707,7 @@ msgid "Add an application to this list"
msgstr "在列表中增加一个应用程序"
#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:90
msgid "Remove"
msgstr "删除"
@@ -1691,6 +1735,8 @@ msgstr "关闭对话框且不进行任何保存"
msgid "shows the preferences web page"
msgstr "显示参数设置网页"
+#. TODO: fill in the default directory for MSW
+#. TODO: fill in the default directory for Linux
#: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
#: clientgui/DlgExclusiveApps.cpp:315
msgid "Applications to add"
@@ -1762,6 +1808,7 @@ msgstr "记住当前的选择并不再显示本对话框。"
#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/wizardex.cpp:378
msgid "&Cancel"
msgstr "取消(&C)"
@@ -1818,10 +1865,12 @@ msgstr "任务获取被延迟"
msgid " work fetch deferral interval"
msgstr "任务获取延迟间隔"
+#. set dialog title
#: clientgui/DlgItemProperties.cpp:239
msgid "Properties of project "
msgstr "项目属性"
+#. layout controls
#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
msgid "General"
msgstr "综合"
@@ -1838,7 +1887,7 @@ msgstr "用户名称"
msgid "Team name"
msgstr "团队名称"
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
msgid "Resource share"
msgstr "资源分享"
@@ -1953,11 +2002,11 @@ msgstr "时长校正因子"
msgid "Properties of task "
msgstr "任务属性"
-#: clientgui/DlgItemProperties.cpp:357
+#: clientgui/DlgItemProperties.cpp:357 clientgui/ViewWork.cpp:266
msgid "Application"
msgstr "计算程序"
-#: clientgui/DlgItemProperties.cpp:358
+#: clientgui/DlgItemProperties.cpp:358 clientgui/ViewWork.cpp:267
msgid "Name"
msgstr "任务名称"
@@ -2017,7 +2066,8 @@ msgstr "目录"
msgid "Process ID"
msgstr "进程标识"
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
msgid "Local: "
msgstr "本地:"
@@ -2090,6 +2140,7 @@ msgid "Address:"
msgstr "地址:"
#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
msgid "Port:"
msgstr "端口:"
@@ -2102,11 +2153,13 @@ msgid "Leave these blank if not needed"
msgstr "下面的内容如果不需要请留空"
#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
msgid "User Name:"
msgstr "用户名:"
#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
+#: clientgui/ProxyPage.cpp:366
msgid "Password:"
msgstr "密码:"
@@ -2301,6 +2354,7 @@ msgid "The home page of the GEO-600 project"
msgstr "GEO-600 项目的主页"
#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
+#: clientgui/ViewProjects.cpp:247 clientgui/ViewStatistics.cpp:441
msgid "Team"
msgstr "团队"
@@ -2466,6 +2520,8 @@ msgstr "项目已被用户暂停"
msgid "Task suspended by user"
msgstr "任务已被用户暂停"
+#. an NCI process can be running even though computation is suspended
+#. (because of
#: clientgui/MainDocument.cpp:2507
msgid "Suspended - "
msgstr "已暂停 - "
@@ -2622,7 +2678,7 @@ msgstr "要选择一个项目,请点击它的项目名称或在下方输入它
msgid "Categories:"
msgstr "类别:"
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
msgid "Projects:"
msgstr "项目:"
@@ -2781,380 +2837,6 @@ msgstr "自动检测"
msgid "SOCKS proxy"
msgstr "SOCKS 代理"
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "皮肤"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "选择用户界面的外观。"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "显示诊断消息。"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "高级视图...\tCtrl+Shift+A"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "显示高级图形界面。"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "配置界面及代理服务器选项"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "缺省"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "暂停"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "暂停计算"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "继续计算"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "通知"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "打开一个窗口,查看来自计算网站或 BOINC 网站的通知消息。"
-
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "获取 %s 的帮助信息"
-
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "获取通知中,请稍候..."
-
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "当前没有可以显示的通知。"
-
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "关闭"
-
-#: clientgui/sg_DlgMessages.cpp:394
-#, c-format
-msgid "%s - Notices"
-msgstr "%s - 通知"
-
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "更多的参数设置,请在高级视图下选择“计算参数设置”来查看。"
-
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "GB 的磁盘空间"
-
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s -计算参数设置"
-
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "放弃所有本地设置并使用网站上的设置吗?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:66
-msgid "Update"
-msgstr "更新"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:67
-msgid ""
-"Report all completed tasks, get latest credit, get latest preferences, and "
-"possibly get more tasks."
-msgstr "上报所有完成的任务,获取最新的积分及参数设置,可能下载更多的新任务。"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:73
-#: clientgui/sg_ProjectCommandPopup.cpp:129
-msgid "Suspend tasks for this project."
-msgstr "暂停当前项目的所有任务。"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:78
-#: clientgui/sg_ProjectCommandPopup.cpp:136
-msgid "No new tasks"
-msgstr "禁止下载新任务"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:79
-msgid "Don't get new tasks for this project."
-msgstr "该项目不再下载任何新任务。"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:84
-msgid "Reset project"
-msgstr "重置项目"
-
-#: 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/sg_ProjectCommandPopup.cpp:91
-msgid ""
-"Remove this project. Tasks in progress will be lost (use 'Update' first to "
-"report any completed tasks)."
-msgstr "删除当前项目。该项目所有正在计算的任务将丢失,您可以先点击“更新”按钮以上报所有已经完成的任务。"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:96
-#: clientgui/sg_TaskCommandPopup.cpp:84
-msgid "Properties"
-msgstr "属性"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:97
-msgid "Show project details."
-msgstr "显示项目细节。"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr "继续当前任务的计算。"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "允许下载新任务"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "允许当前项目下载新任务。"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-msgid "Don't fetch new tasks for this project."
-msgstr "禁止当前项目下载新任务。"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "您确定要重置'%s'项目吗?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-msgid "Reset Project"
-msgstr "重置项目"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "您确定要删除'%s'项目吗?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-msgid "Remove Project"
-msgstr "移除项目"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "增加项目"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "同步"
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "已为该项目完成的任务"
-
-#: clientgui/sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "志愿加入到一个或多个分布在许多不同科学领域内的研究项目"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "从帐户管理系统同步项目"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "选择一个要操作的项目"
-
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "项目网站"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "项目命令"
-
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "弹出一个 %s 项目的网站菜单"
-
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "弹出一个 %s 项目可用的命令菜单"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "显示图形"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "在新窗口中显示项目图形。"
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "暂停该任务。"
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "中止"
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "放弃这个任务,你将得不到相应的任务积分。"
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "显示任务细节。"
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "继续计算当前任务。"
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "暂停计算当前任务。"
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr "您确定要中止当前任务'%s'吗?\n( 进度:%.1lf%%,状态:%s )"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "中止任务"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects. Please Add a Project."
-msgstr "您当前没有加入到任何项目,请先加入一个项目。"
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "不可用"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "任务:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "选择一个要操作的任务"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "来自:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "该计算任务的进度"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "任务命令"
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "弹出一个应用于当前计算任务的命令菜单"
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "计算程序:%s"
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "计算程序:不可用"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "不可用"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "已用时:%s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "剩余时间:%s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "状态:%s"
-
-#: clientgui/sg_TaskPanel.cpp:1228
-msgid "Retrieving current status."
-msgstr "正在获取当前状态。"
-
-#: clientgui/sg_TaskPanel.cpp:1234
-msgid "Downloading work from the server."
-msgstr "正在从服务器下载任务。"
-
-#: clientgui/sg_TaskPanel.cpp:1239
-msgid "Processing Suspended: Running On Batteries."
-msgstr "暂停计算:电池供电。"
-
-#: clientgui/sg_TaskPanel.cpp:1241
-msgid "Processing Suspended: User Active."
-msgstr "暂停计算:用户活跃。"
-
-#: clientgui/sg_TaskPanel.cpp:1243
-msgid "Processing Suspended: User paused processing."
-msgstr "暂停计算:用户暂停计算。"
-
-#: clientgui/sg_TaskPanel.cpp:1245
-msgid "Processing Suspended: Time of Day."
-msgstr "暂停计算: 休息时间段。"
-
-#: clientgui/sg_TaskPanel.cpp:1247
-msgid "Processing Suspended: Benchmarks Running."
-msgstr "暂停计算:正在运行基准测试。"
-
-#: clientgui/sg_TaskPanel.cpp:1249
-msgid "Processing Suspended."
-msgstr "暂停计算。"
-
-#: clientgui/sg_TaskPanel.cpp:1253
-msgid "Waiting to contact project servers."
-msgstr "正在等待连接项目服务器。"
-
-#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
-msgid "Retrieving current status"
-msgstr "正在获取当前状态"
-
-#: clientgui/sg_TaskPanel.cpp:1261
-msgid "No work available to process"
-msgstr "无任务可供处理"
-
-#: clientgui/sg_TaskPanel.cpp:1263
-msgid "Unable to connect to the core client"
-msgstr "无法连接至客户端的核心服务程序"
-
#: clientgui/TermsOfUsePage.cpp:218
msgid "Terms of Use"
msgstr "使用协议"
@@ -3248,7 +2930,10 @@ msgstr "'%s'中未包含正确的主机名称。"
msgid "'%s' does not contain a valid path."
msgstr "'%s'中未包含正确的路径。"
-#: clientgui/ViewMessages.cpp:84
+#. Setup View
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:192
+#: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
+#: clientgui/ViewWork.cpp:207
msgid "Commands"
msgstr "命令"
@@ -3292,6 +2977,79 @@ msgstr "显示所有消息"
msgid "Show messages for all projects."
msgstr "显示所有项目的消息。"
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "获取通知中,请稍候..."
+
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "当前没有可以显示的通知。"
+
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
+msgid "Notices"
+msgstr "通知"
+
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
+msgid "Update"
+msgstr "更新"
+
+#: clientgui/ViewProjects.cpp:197 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:203 clientgui/ViewProjects.cpp:802
+#: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
+#: clientgui/sg_BoincSimpleFrame.cpp:893
+#: clientgui/sg_ProjectCommandPopup.cpp:72
+#: clientgui/sg_ProjectCommandPopup.cpp:128
+#: clientgui/sg_TaskCommandPopup.cpp:72 clientgui/sg_TaskCommandPopup.cpp:122
+msgid "Suspend"
+msgstr "暂停"
+
+#: clientgui/ViewProjects.cpp:204 clientgui/ViewProjects.cpp:802
+#: clientgui/sg_ProjectCommandPopup.cpp:73
+#: clientgui/sg_ProjectCommandPopup.cpp:129
+msgid "Suspend tasks for this project."
+msgstr "暂停当前项目的所有任务。"
+
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:821
+#: clientgui/sg_ProjectCommandPopup.cpp:78
+#: clientgui/sg_ProjectCommandPopup.cpp:136
+msgid "No new tasks"
+msgstr "禁止下载新任务"
+
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
+msgid "Don't get new tasks for this project."
+msgstr "该项目不再下载任何新任务。"
+
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
+msgid "Reset project"
+msgstr "重置项目"
+
+#: clientgui/ViewProjects.cpp:218 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:225 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:231 clientgui/ViewWork.cpp:246
+#: clientgui/sg_ProjectCommandPopup.cpp:96
+#: clientgui/sg_TaskCommandPopup.cpp:84
+msgid "Properties"
+msgstr "属性"
+
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
+msgid "Show project details."
+msgstr "显示项目细节。"
+
#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
msgid "Account"
msgstr "帐户"
@@ -3337,14 +3095,48 @@ msgstr "禁止项目下载更多的任务..."
msgid "Resetting project..."
msgstr "正在重置项目..."
+#: clientgui/ViewProjects.cpp:518 clientgui/sg_ProjectCommandPopup.cpp:229
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "您确定要重置'%s'项目吗?"
+
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:235
+msgid "Reset Project"
+msgstr "重置项目"
+
#: clientgui/ViewProjects.cpp:563
msgid "Removing project..."
msgstr "正在删除项目..."
+#: clientgui/ViewProjects.cpp:576 clientgui/sg_ProjectCommandPopup.cpp:266
+#, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "您确定要删除'%s'项目吗?"
+
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:272
+msgid "Remove Project"
+msgstr "移除项目"
+
#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
msgid "Launching browser..."
msgstr "正在启动浏览器..."
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
+msgstr "继续当前任务的计算。"
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
+msgstr "允许下载新任务"
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
+msgstr "允许当前项目下载新任务。"
+
+#: clientgui/ViewProjects.cpp:821 clientgui/sg_ProjectCommandPopup.cpp:137
+msgid "Don't fetch new tasks for this project."
+msgstr "禁止当前项目下载新任务。"
+
#: clientgui/ViewProjects.cpp:1140
msgid "Requested by user"
msgstr "用户发起的请求"
@@ -3688,6 +3480,14 @@ msgstr "显示活动任务"
msgid "Show only active tasks."
msgstr "只显示正在计算过程中的任务。"
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
+msgid "Show graphics"
+msgstr "显示图形"
+
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
+msgid "Show application graphics in a window."
+msgstr "在新窗口中显示项目图形。"
+
#: clientgui/ViewWork.cpp:225
msgid "Show VM Console"
msgstr "显示虚拟机控制台"
@@ -3700,10 +3500,18 @@ msgstr "在窗口里显示虚拟机控制台。"
msgid "Suspend work for this result."
msgstr "暂停当前任务。"
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
+msgid "Abort"
+msgstr "中止"
+
#: clientgui/ViewWork.cpp:240
msgid "Abandon work on the result. You will get no credit for it."
msgstr "中止该任务,您将不能得到它的积分。"
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
+msgid "Show task details."
+msgstr "显示任务细节。"
+
#: clientgui/ViewWork.cpp:264
msgid "Remaining (estimated)"
msgstr "剩余时间(估计)"
@@ -3744,6 +3552,10 @@ msgstr "您确定要中止当前任务'%s'吗?\n(进度:%s,状态:%s
msgid "Are you sure you want to abort these %d tasks?"
msgstr "您确定想要中止这 %d 个任务吗?"
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
+msgid "Abort task"
+msgstr "中止任务"
+
#: clientgui/ViewWork.cpp:586
msgid "Aborting task..."
msgstr "中止任务..."
@@ -3756,68 +3568,297 @@ msgstr "显示所有任务"
msgid "Show all tasks."
msgstr "显示所有的任务。"
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "增加项目或帐户管理器"
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr "继续计算当前任务。"
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "添加项目或使用 BOINC 账户管理器"
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr "暂停计算当前任务。"
-#: clientgui/WelcomePage.cpp:297
-#, c-format
-msgid ""
-"If possible, add projects at the\n"
-"%s web site.\n"
-"\n"
-"Projects added via this wizard will not be\n"
-"listed on or managed via %s."
-msgstr "如果可能的话,请在 %s 网站添加项目。\n\n通过向导增加的项目将不能在 %s 中显示及进行管理。"
-
-#: clientgui/WelcomePage.cpp:313
-msgid ""
-"There are over 30 BOINC-based projects\n"
-"doing research in many areas of science,\n"
-"and you can volunteer for as many of them as you like.\n"
-"You can add a project directly,\n"
-"or use an 'Account Manager' web site to select projects."
-msgstr "目前有超过 30 个基于 BOINC 的项目,其研究内容涉及多个科学领域,\n你可以根据自己的喜好参加这些项目。\n你既可以直接加入项目,也可以通过“帐户管理器”网站来选择项目。"
-
-#: clientgui/WelcomePage.cpp:325
-msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
-"you contribute to.\n"
-"\n"
-"Some of these projects are run and managed by World Community Grid, while others\n"
-"are run and managed by other researchers or organizations. The BOINC software\n"
-"can divide your spare processing power among any combination of projects.\n"
-"\n"
-"Alternatively, if you have registered with a BOINC Account Manager, you can use\n"
-"this to choose which projects to support.\n"
-"\n"
-"Please choose which type of change you would like to make:\n"
-msgstr "你已经选择添加一个新的志愿计算项目或改变你已经参加的项目。\n\n这其中的一些项目是由 World Community Grid 来运营和管理的,\n还有一些是由其它的研究人员或机构运营和管理。\nBOINC 软件允许你基于各种项目组合来分配计算资源。\n\n此外,如果你注册了 BOINC 账户管理器,也可以使用它来选择你要支持的项目。\n\n请根据你的需要进行选择:\n"
-
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "使用 BOINC 账户管理器"
-
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "添加或改变你在 World Community Grid 上的项目"
-
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "添加其它研究人员或机构运营的项目"
-
-#: clientgui/WizardAttach.cpp:560
+#: clientgui/WizardAttach.cpp:563
msgid "Do you really want to cancel?"
msgstr "您确定要取消吗?"
-#: clientgui/WizardAttach.cpp:561
+#: clientgui/WizardAttach.cpp:564
msgid "Question"
msgstr "问题"
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "图表控制"
+
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
+msgid "Services"
+msgstr "服务"
+
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
+#, c-format
+msgid "Hide %s"
+msgstr "隐藏 %s"
+
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
+msgstr "隐藏其它"
+
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
+msgstr "显示所有"
+
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
+msgstr "退出 %s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr "皮肤"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr "选择用户界面的外观。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "高级视图...\tCtrl+Shift+A"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
+msgstr "显示高级图形界面。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr "配置界面及代理服务器选项"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr "显示诊断消息。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
+msgstr "缺省"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
+msgstr "暂停计算"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
+msgstr "继续计算"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "打开一个窗口,查看来自计算网站或 BOINC 网站的通知消息。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:370
+#, c-format
+msgid "Get help with %s"
+msgstr "获取 %s 的帮助信息"
+
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "关闭"
+
+#: clientgui/sg_DlgMessages.cpp:394
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - 通知"
+
+#: clientgui/sg_DlgPreferences.cpp:206
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "更多的参数设置,请在高级视图下选择“计算参数设置”来查看。"
+
+#: clientgui/sg_DlgPreferences.cpp:345
+msgid "GB of disk space"
+msgstr "GB 的磁盘空间"
+
+#: clientgui/sg_DlgPreferences.cpp:1099
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s -计算参数设置"
+
+#: clientgui/sg_DlgPreferences.cpp:1180
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "放弃所有本地设置并使用网站上的设置吗?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "增加项目"
+
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "同步"
+
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "已为该项目完成的任务"
+
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "志愿加入到一个或多个分布在许多不同科学领域内的研究项目"
+
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "从帐户管理系统同步项目"
+
+#. TODO: Might want better wording for Project Selection Combo Box tooltip
+#: clientgui/sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "选择一个要操作的项目"
+
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "项目网站"
+
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "项目命令"
+
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "弹出一个 %s 项目的网站菜单"
+
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "弹出一个 %s 项目可用的命令菜单"
+
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "暂停该任务。"
+
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "放弃这个任务,你将得不到相应的任务积分。"
+
+#: clientgui/sg_TaskCommandPopup.cpp:267
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "您确定要中止当前任务'%s'吗?\n( 进度:%.1lf%%,状态:%s )"
+
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects. Please Add a Project."
+msgstr "您当前没有加入到任何项目,请先加入一个项目。"
+
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "不可用"
+
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "任务:"
+
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
+msgstr "选择一个要操作的任务"
+
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "来自:"
+
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "该计算任务的进度"
+
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "任务命令"
+
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "弹出一个应用于当前计算任务的命令菜单"
+
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "计算程序:%s"
+
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
+
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "计算程序:不可用"
+
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "不可用"
+
+#: clientgui/sg_TaskPanel.cpp:851
+#, c-format
+msgid "Elapsed: %s"
+msgstr "已用时:%s"
+
+#: clientgui/sg_TaskPanel.cpp:865
+#, c-format
+msgid "Remaining (estimated): %s"
+msgstr "剩余时间:%s"
+
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "状态:%s"
+
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "正在获取当前状态。"
+
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "正在从服务器下载任务。"
+
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended: Running On Batteries."
+msgstr "暂停计算:电池供电。"
+
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended: User Active."
+msgstr "暂停计算:用户活跃。"
+
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended: User paused processing."
+msgstr "暂停计算:用户暂停计算。"
+
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended: Time of Day."
+msgstr "暂停计算: 休息时间段。"
+
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended: Benchmarks Running."
+msgstr "暂停计算:正在运行基准测试。"
+
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "暂停计算。"
+
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "正在等待连接项目服务器。"
+
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "正在获取当前状态"
+
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "无任务可供处理"
+
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
+msgstr "无法连接至客户端的核心服务程序"
+
#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
msgid "&Next >"
msgstr "下一步(&N) >"
@@ -3830,32 +3871,7 @@ msgstr "< 上一步(&B)"
msgid "&Finish"
msgstr "完成(&F)"
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "图表控制"
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "服务"
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "隐藏 %s"
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "隐藏其它"
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "显示所有"
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "退出 %s"
-
+#. /////////////////////////////////////////////////////////////////////////
#: clientgui/DlgAdvPreferencesBase.h:45
msgid "On this day of the week, compute only during these hours."
msgstr "在这一周中的此天,只在这些时间内计算。"
diff --git a/samples/vboxwrapper/vbox_vboxmanage.cpp b/samples/vboxwrapper/vbox_vboxmanage.cpp
index 52840dc494..f506cea43c 100644
--- a/samples/vboxwrapper/vbox_vboxmanage.cpp
+++ b/samples/vboxwrapper/vbox_vboxmanage.cpp
@@ -42,6 +42,7 @@ using std::string;
#if defined(_MSC_VER)
#define getcwd _getcwd
#define stricmp _stricmp
+#define snprintf _snprintf
#endif
#include "diagnostics.h"
@@ -1351,13 +1352,25 @@ bool VBOX_VM::is_system_ready(std::string& message) {
rc = false;
}
- if (output.find("WARNING: The vboxdrv kernel module is not loaded.") != string::npos) {
- vboxlog_msg("WARNING: The vboxdrv kernel module is not loaded.");
+ if (
+ (output.find("WARNING: The vboxdrv kernel module is not loaded.") != string::npos) ||
+ (output.find("WARNING: The VirtualBox kernel modules are not loaded.") != string::npos)
+ ){
+ vboxlog_msg("WARNING: The VirtualBox kernel modules are not loaded.");
vboxlog_msg("WARNING: Please update/recompile VirtualBox kernel drivers.");
message = "Please update/recompile VirtualBox kernel drivers.";
rc = false;
}
+ if (
+ (output.find("Warning: program compiled against ") != string::npos) &&
+ (output.find(" using older ") != string::npos)
+ ){
+ vboxlog_msg("WARNING: VirtualBox incompatible dependencies detected.");
+ message = "Please update/reinstall VirtualBox";
+ rc = false;
+ }
+
return rc;
}
@@ -1468,7 +1481,9 @@ int VBOX_VM::get_install_directory(string& install_directory) {
int VBOX_VM::get_version_information(string& version) {
string command;
string output;
+ int vbox_major = 0, vbox_minor = 0, vbox_release = 0;
int retval;
+ char buf[256];
// Record the VirtualBox version information for later use.
command = "--version ";
@@ -1484,7 +1499,17 @@ int VBOX_VM::get_version_information(string& version) {
++iter;
}
}
- version = string("VirtualBox VboxManage Interface (Version: ") + output + string(")");
+
+ if (3 == sscanf(output.c_str(), "%d.%d.%d", &vbox_major, &vbox_minor, &vbox_release)) {
+ snprintf(
+ buf, sizeof(buf),
+ "VirtualBox VboxManage Interface (Version: %d.%d.%d)",
+ vbox_major, vbox_minor, vbox_release
+ );
+ version = buf;
+ } else {
+ version = "VirtualBox VboxManage Interface (Version: Unknown)";
+ }
}
return retval;