mirror of https://github.com/BOINC/boinc.git
Merge branch 'master' of ssh://boinc.berkeley.edu/boinc-v2
This commit is contained in:
David Anderson
commit
9b1f0e8574
|
|
@ -8,7 +8,7 @@
|
|||
<string name="generic_button_finish">Terminer</string>
|
||||
<!--attach project-->
|
||||
<!--selection list-->
|
||||
<string name="attachproject_list_desc">Choisir un projet scientifique auquel vous voulez collaborer:</string>
|
||||
<string name="attachproject_list_desc">Choisir un projet scientifique auquel vous voulez collaborer :</string>
|
||||
<string name="attachproject_list_header">Choisissez un projet</string>
|
||||
<string name="attachproject_list_manual_button">Ajouter un projet via son URL</string>
|
||||
<string name="attachproject_list_manual_dialog_title">URL du projet:</string>
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
<string name="attachproject_working_acctmgr_sync">Synchroniser</string>
|
||||
<!--main activity-->
|
||||
<string name="main_noproject_warning">Touchez ici pour choisir un projet.</string>
|
||||
<string name="main_error">Oups!</string>
|
||||
<string name="main_error">Oups !</string>
|
||||
<string name="main_error_long">...ceci ne devrait pas se produire!\nCliquer sur l\'icône pour essayer de nouveau.</string>
|
||||
<string name="main_title_icon_desc">Icône de BOINC</string>
|
||||
<!--tab names-->
|
||||
|
|
@ -171,9 +171,9 @@
|
|||
<string name="battery_temperature_max_header">Température batterie maximale.</string>
|
||||
<string name="battery_temperature_max_description">BOINC suspend le calcul au dessus de la température de batterie définie. Il n\'est pas recommandé de modifier cette valeur.</string>
|
||||
<string name="prefs_disk_max_pct_header">Espace de stockage utilisé maximum</string>
|
||||
<string name="prefs_disk_max_pct_description">Quel pourcentage de l\'espace de stockage BOINC peut-il utiliser ? </string>
|
||||
<string name="prefs_disk_max_pct_description">Quel pourcentage de l\'espace de stockage BOINC peut-il utiliser ? </string>
|
||||
<string name="prefs_disk_min_free_gb_header">Capacité de stockage minimum</string>
|
||||
<string name="prefs_disk_min_free_gb_description">Quelle capacité de stockage de votre appareil doit rester disponible ? </string>
|
||||
<string name="prefs_disk_min_free_gb_description">Quelle capacité de stockage de votre appareil doit rester disponible ? </string>
|
||||
<string name="prefs_disk_access_interval_header">Intervalle d\'accès</string>
|
||||
<string name="prefs_disk_access_interval_description">Suggère un intervalle entre les accès disque</string>
|
||||
<string name="prefs_network_daily_xfer_limit_mb_header">Limite de transfert journalier</string>
|
||||
|
|
@ -182,7 +182,7 @@
|
|||
<string name="prefs_autostart_header">Démarage automatique</string>
|
||||
<string name="prefs_show_notification_notices_header">Afficher les notifications pour les nouvelles remarques</string>
|
||||
<string name="prefs_show_notification_suspended_header">Afficher les notifications lorsque suspendu</string>
|
||||
<string name="prefs_cpu_number_cpus_header">Cores CPU utilisés</string>
|
||||
<string name="prefs_cpu_number_cpus_header">Cœurs du CPU utilisés</string>
|
||||
<string name="prefs_cpu_number_cpus_description">Limiter le nombre de cores CPU que BOINC peut utiliser pour le calcul.</string>
|
||||
<string name="prefs_cpu_other_load_suspension_header">Mettre en pause si l\'utilisation du CPU dépasse</string>
|
||||
<string name="prefs_cpu_other_load_suspension_description">Détermine si BOINC doit suspendre les calculs du fait de l\'exécution d\'autres applications.</string>
|
||||
|
|
@ -192,7 +192,7 @@
|
|||
<string name="prefs_memory_max_idle_description">Limite la quantité de RAM que les tâches peuvent utiliser. </string>
|
||||
<string name="prefs_client_log_flags_header">Drapeaux de journal du client BOINC</string>
|
||||
<string name="prefs_gui_log_level_header">Journal niveau GUI</string>
|
||||
<string name="prefs_gui_log_level_description">Définit le niveau de détail des messages du journal GUI</string>
|
||||
<string name="prefs_gui_log_level_description">Définit le niveau de détail de la GUI des messages du journal</string>
|
||||
<string name="prefs_unit_mb">Mo</string>
|
||||
<string name="prefs_unit_gb">Go</string>
|
||||
<string name="prefs_unit_pct">%</string>
|
||||
|
|
@ -207,7 +207,7 @@
|
|||
<string name="projects_credits_user_header">(total)</string>
|
||||
<!--project status strings-->
|
||||
<string name="projects_status_suspendedviagui">Suspendu par l\'utilisateur</string>
|
||||
<string name="projects_status_dontrequestmorework">Pas de nouveau travail</string>
|
||||
<string name="projects_status_dontrequestmorework">Pas de nouvelle tâche</string>
|
||||
<string name="projects_status_ended">Projet terminé - OK pour le retirer.</string>
|
||||
<string name="projects_status_detachwhendone">Se détacher une fois les tâches terminées</string>
|
||||
<string name="projects_status_schedrpcpending">Requête au planificateur en attente</string>
|
||||
|
|
@ -216,21 +216,21 @@
|
|||
<string name="projects_status_backoff">Communication prévue dans:</string>
|
||||
<!--project controls-->
|
||||
<string name="projects_control_dialog_title">Commandes du projet:</string>
|
||||
<string name="projects_control_visit_website">Visitez le site web</string>
|
||||
<string name="projects_control_visit_website">Visitez le site Web</string>
|
||||
<string name="projects_control_update">Mise à jour</string>
|
||||
<string name="projects_control_remove">Supprimer</string>
|
||||
<string name="projects_control_suspend">Suspendre</string>
|
||||
<string name="projects_control_resume">Reprendre</string>
|
||||
<string name="projects_control_nonewtasks">Pas de nouveau travail</string>
|
||||
<string name="projects_control_allownewtasks">Autoriser du nouveau travail</string>
|
||||
<string name="projects_control_nonewtasks">Pas de nouvelle tâche</string>
|
||||
<string name="projects_control_allownewtasks">Autoriser une nouvelle tâche</string>
|
||||
<string name="projects_control_reset">Réinitialiser</string>
|
||||
<string name="projects_control_dialog_title_acctmgr">Commandes du gestionnaire de compte:</string>
|
||||
<string name="projects_control_sync_acctmgr">Synchroniser</string>
|
||||
<string name="projects_control_remove_acctmgr">Désactiver</string>
|
||||
<!--project confirm dialog-->
|
||||
<string name="projects_confirm_detach_title">Supprimer le projet?</string>
|
||||
<string name="projects_confirm_detach_title">Supprimer le projet ?</string>
|
||||
<string name="projects_confirm_detach_message">Êtes-vous sûr de vouloir supprimer </string>
|
||||
<string name="projects_confirm_detach_message2">de BOINC ?</string>
|
||||
<string name="projects_confirm_detach_message2">de BOINC ?</string>
|
||||
<string name="projects_confirm_detach_confirm">Supprimer</string>
|
||||
<string name="projects_confirm_reset_title">Recommencer le projet</string>
|
||||
<string name="projects_confirm_reset_message">Êtes-vous sûr de vouloir recommencer </string>
|
||||
|
|
@ -249,7 +249,7 @@
|
|||
<string name="tasks_result_files_downloading">En attente de téléchargement</string>
|
||||
<string name="tasks_result_files_downloaded">Téléchargement terminé</string>
|
||||
<string name="tasks_result_compute_error">erreur de calcul</string>
|
||||
<string name="tasks_result_files_uploading">Téléversement (upload)</string>
|
||||
<string name="tasks_result_files_uploading">Transférer</string>
|
||||
<string name="tasks_result_files_uploaded">Mise à jour effectuée</string>
|
||||
<string name="tasks_result_aborted">annulé</string>
|
||||
<string name="tasks_result_upload_failed">échec du chargement </string>
|
||||
|
|
@ -262,8 +262,8 @@
|
|||
<string name="tasks_custom_project_suspended_via_gui">projet suspendu</string>
|
||||
<string name="tasks_custom_ready_to_report">prêt à valider</string>
|
||||
<!--confirmation dialog-->
|
||||
<string name="confirm_abort_task_title">Abandonner la tâche?</string>
|
||||
<string name="confirm_abort_task_message">Abandonner la tâche:</string>
|
||||
<string name="confirm_abort_task_title">Abandonner la tâche ?</string>
|
||||
<string name="confirm_abort_task_message">Abandonner la tâche :</string>
|
||||
<string name="confirm_abort_task_confirm">Abandonner</string>
|
||||
<string name="confirm_cancel">Annuler</string>
|
||||
<string name="confirm_image_desc">Confirmation</string>
|
||||
|
|
@ -277,17 +277,17 @@
|
|||
<string name="trans_active">actif</string>
|
||||
<string name="trans_pending">en attente</string>
|
||||
<string name="trans_projectbackoff"> retrait de projet</string>
|
||||
<string name="trans_header_name">Fichier:</string>
|
||||
<string name="trans_header_name">Fichier :</string>
|
||||
<string name="trans_control_retry">Réessayer le transfert</string>
|
||||
<string name="confirm_abort_trans_title">Annuler le transfert?</string>
|
||||
<string name="confirm_abort_trans_message">Annuler le transfert de fichier</string>
|
||||
<string name="confirm_abort_trans_title">Annuler le transfert ?</string>
|
||||
<string name="confirm_abort_trans_message">Abandonner le fichier :</string>
|
||||
<string name="confirm_abort_trans_confirm">Abandonner</string>
|
||||
<!--notices tab strings-->
|
||||
<string name="notices_loading">Lecture des remarques...</string>
|
||||
<!--eventlog tab strings-->
|
||||
<string name="eventlog_loading">Chargement du journal de messages...</string>
|
||||
<string name="eventlog_client_header">Messages du client</string>
|
||||
<string name="eventlog_gui_header">Messages GUI</string>
|
||||
<string name="eventlog_gui_header">GUI des Messages</string>
|
||||
<string name="eventlog_copy_toast">Journal copié dans le presse-papier.</string>
|
||||
<string name="eventlog_email_subject">Journal de message pour le client BOINC Android:</string>
|
||||
<!--suspend reasons-->
|
||||
|
|
@ -323,18 +323,18 @@
|
|||
<string name="rpcreason_projectreq">Demandé par le projet</string>
|
||||
<string name="rpcreason_unknown">Raison inconnue</string>
|
||||
<!--menu-->
|
||||
<string name="menu_refresh">Rafraichir</string>
|
||||
<string name="menu_emailto">Envoyer via un email </string>
|
||||
<string name="menu_refresh">Rafraîchir</string>
|
||||
<string name="menu_emailto">Envoyer en e-mail </string>
|
||||
<string name="menu_copy">Copier dans le presse-papier</string>
|
||||
<string name="menu_eventlog">Journal des évènements</string>
|
||||
<string name="menu_exit">Fermer BOINC</string>
|
||||
<string name="menu_run_mode_disable">Suspendre</string>
|
||||
<string name="menu_run_mode_enable">Reprendre</string>
|
||||
<string name="menu_about">A propos de</string>
|
||||
<string name="menu_about">A propos</string>
|
||||
<string name="menu_help">Aide</string>
|
||||
<!--about dialog-->
|
||||
<string name="about_button">Retour</string>
|
||||
<string name="about_title">A propos de</string>
|
||||
<string name="about_title">A propos</string>
|
||||
<string name="about_name">BOINC</string>
|
||||
<string name="about_version">Version</string>
|
||||
<string name="about_name_long">Berkeley Open Infrastructure for Network Computing</string>
|
||||
|
|
@ -352,9 +352,9 @@
|
|||
<string name="nonexcl_dialog_exit">Quitter</string>
|
||||
<!--social integration-->
|
||||
<string name="social_invite_button">Inviter des amis</string>
|
||||
<string name="social_invite_intent_title">Comment voulez-vous partager ? </string>
|
||||
<string name="social_invite_content_title">Je fais du calcul scientifique sur mon smatphone !</string>
|
||||
<string name="social_invite_content_body">J\'utilise mon %1$s pour faire du calcul scientifique. Vous pouvez le faire aussi! Téléchargez l\'application à partir de: %2$s</string>
|
||||
<string name="social_invite_intent_title">Comment voulez-vous partager ? </string>
|
||||
<string name="social_invite_content_title">Je fais du calcul scientifique sur mon smatphone !</string>
|
||||
<string name="social_invite_content_body">J\'utilise mon %1$s pour faire du calcul scientifique. Vous pouvez le faire aussi ! Téléchargez l\'application à partir de : %2$s</string>
|
||||
<!--first parameter: device manufacturer, second: URL-->
|
||||
<string name="social_invite_content_url">https://play.google.com/store/apps/details?id=edu.berkeley.boinc</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -670,7 +670,7 @@ void COPROCS::bound_counts() {
|
|||
for (int j=1; j<n_rsc; j++) {
|
||||
msg_printf(NULL, MSG_INFO, "Coprocessor specified in cc_config.xml. Type %s (%s); count %d",
|
||||
coprocs[j].type,
|
||||
coprocs[j].non_gpu?" non-GPU":"GPU",
|
||||
coprocs[j].non_gpu?"non-GPU":"GPU",
|
||||
coprocs[j].count
|
||||
);
|
||||
if (coprocs[j].count > MAX_COPROC_INSTANCES) {
|
||||
|
|
|
|||
|
|
@ -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; columnID<shownColCount; ++columnID) {
|
||||
for (columnID=0; columnID<limit; ++columnID) {
|
||||
aOrder[columnID] = columnID;
|
||||
pView->AppendColumn(columnID);
|
||||
pView->m_iColumnIndexToColumnID.Add(columnID);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
require_once("docutil.php");
|
||||
|
||||
page_head("Email lists");
|
||||
page_head("BOINC email lists");
|
||||
|
||||
|
||||
echo "
|
||||
|
|
@ -50,7 +50,7 @@ list_item(
|
|||
"For people developing web sites showing statistics for BOINC projects."
|
||||
);
|
||||
list_item("<a href=http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_cvs>boinc_cvs</a>",
|
||||
"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("<a href=http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_opt>boinc_opt</a>",
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
# Translators:
|
||||
# Axelle Andy <andex@voila.fr>, 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 <jerome.cadet@pobox.com>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: fr\n"
|
||||
"PO-Revision-Date: 2015-05-01 12:43+0000\n"
|
||||
"Last-Translator: Axelle Andy <andex@voila.fr>\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."
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue