[boinc] 02/04: Imported Upstream version 7.6.2+dfsg

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Mon Jun 1 08:42:50 UTC 2015


This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 6eb6a120365f75886292d8bb04e3755c7621ea8a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jun 1 10:24:26 2015 +0200

    Imported Upstream version 7.6.2+dfsg
---
 .gitignore                                         |    1 +
 android/BOINC/AndroidManifest.xml                  |    4 +-
 android/BOINC/res/values-cs/strings.xml            |    7 +-
 android/BOINC/res/values-fr/strings.xml            |   52 +-
 android/BOINC/res/values-sk/strings.xml            |    2 +-
 android/BOINC/res/values-tr/strings.xml            |    4 +-
 android/BOINC/res/values-zh-rTW/strings.xml        |   30 +-
 build/getWxWidgets.sh                              |   26 -
 client/app.cpp                                     |   31 +-
 client/app_control.cpp                             |   17 +-
 client/client_state.cpp                            |    4 +
 client/client_state.h                              |    2 +-
 client/cs_account.cpp                              |    3 +-
 client/cs_statefile.cpp                            |    6 +-
 client/gpu_detect.cpp                              |    2 +-
 client/hostinfo_win.cpp                            |  479 ++-
 client/http_curl.cpp                               |    9 +-
 client/http_curl.h                                 |    2 -
 client/sandbox.cpp                                 |   31 +-
 clientgui/AdvancedFrame.cpp                        |   83 +-
 clientgui/AdvancedFrame.h                          |    3 +-
 clientgui/BOINCGUIApp.cpp                          |  246 --
 clientgui/BOINCListCtrl.cpp                        |   34 +-
 clientgui/BOINCTaskBar.cpp                         |   24 +-
 clientgui/DlgAbout.cpp                             |    6 +-
 clientgui/DlgAdvPreferences.cpp                    |   51 +-
 clientgui/DlgAdvPreferences.h                      |    2 +
 clientgui/DlgAdvPreferencesBase.cpp                |  199 +-
 clientgui/DlgEventLog.cpp                          |    5 -
 clientgui/Events.h                                 |    7 +-
 clientgui/MainDocument.cpp                         |    2 +-
 clientgui/Makefile.am                              |    1 -
 clientgui/SkinManager.cpp                          |   34 +-
 clientgui/SkinManager.h                            |   21 +-
 clientgui/ViewProjects.cpp                         |    4 +-
 clientgui/ViewTransfers.cpp                        |    4 +-
 clientgui/ViewWork.cpp                             |    4 +-
 clientgui/WelcomePage.cpp                          |  426 ---
 clientgui/WelcomePage.h                            |   96 -
 clientgui/WizardAttach.cpp                         |   44 +-
 clientgui/WizardAttach.h                           |    3 -
 clientgui/sg_BoincSimpleFrame.cpp                  |  153 +-
 clientgui/sg_BoincSimpleFrame.h                    |    5 +-
 clientgui/sg_DlgPreferences.cpp                    |  238 +-
 clientgui/sg_DlgPreferences.h                      |    6 +
 clientgui/sg_ProjectPanel.cpp                      |    9 +-
 clientgui/sg_ProjectPanel.h                        |    2 +-
 configure.ac                                       |    6 +-
 db/boinc_db.cpp                                    |   24 +-
 db/schema.sql                                      |   18 +-
 doc/email_lists.php                                |   20 +-
 doc/projects.inc                                   |   20 +
 doc/white.css                                      |    4 +-
 html/inc/forum.inc                                 |   23 +-
 html/inc/forum_db.inc                              |    2 +-
 html/inc/forum_email.inc                           |    8 +-
 html/inc/stats_sites.inc                           |    4 +-
 html/inc/user.inc                                  |    2 +-
 html/ops/db_update.php                             |   15 +
 html/ops/dbinfo.php                                |    2 +-
 html/ops/error_summary.php                         |   15 +-
 html/ops/grant_credit.php                          |    3 +
 html/ops/manage_special_users.php                  |    6 +-
 html/ops/manage_special_users_action.php           |    2 +-
 html/ops/size_census.php                           |    7 +-
 html/user/create_profile.php                       |   24 +-
 html/user/forum_report_post.php                    |    2 +-
 html/user/user_permissions.php                     |  117 +
 lib/common_defs.h                                  |    5 +-
 lib/filesys.cpp                                    |   35 +-
 lib/gui_rpc_client.cpp                             |    3 +
 lib/prefs.cpp                                      |   17 +-
 lib/str_replace.h                                  |    6 +-
 locale/ca/BOINC-Manager.mo                         |  Bin 76669 -> 79234 bytes
 locale/ca/BOINC-Manager.po                         | 2878 +++++++++--------
 locale/ca/BOINC-Project-Generic.po                 |    2 +-
 locale/ca/BOINC-Web.mo                             |  Bin 36923 -> 36904 bytes
 locale/ca/BOINC-Web.po                             |    6 +-
 locale/cs/BOINC-Project-Generic.po                 |    2 +-
 locale/cs/BOINC-Setup.mo                           |  Bin 3071 -> 3071 bytes
 locale/cs/BOINC-Setup.po                           |    2 +-
 locale/de/BOINC-Project-Generic.po                 | 3343 ++++++++++----------
 locale/en/BOINC-Drupal.po                          | 1518 +++++++++
 locale/en/BOINC-Manager.mo                         |  Bin 75384 -> 73178 bytes
 locale/en/BOINC-Manager.po                         | 1834 +++++------
 locale/fr/BOINC-Client.mo                          |  Bin 5005 -> 4996 bytes
 locale/fr/BOINC-Client.po                          |  139 +-
 locale/fr/BOINC-Manager.mo                         |  Bin 83737 -> 81276 bytes
 locale/fr/BOINC-Manager.po                         | 1824 +++++------
 locale/fr/BOINC-Project-Generic.po                 | 3282 ++++++++++---------
 locale/fr/BOINC-Setup.mo                           |  Bin 3355 -> 3158 bytes
 locale/fr/BOINC-Setup.po                           |   72 +-
 locale/it_IT/BOINC-Manager.mo                      |  Bin 81334 -> 78954 bytes
 locale/it_IT/BOINC-Manager.po                      | 1832 +++++------
 locale/it_IT/BOINC-Project-Generic.po              |    4 +-
 locale/it_IT/BOINC-Setup.mo                        |  Bin 3028 -> 3009 bytes
 locale/it_IT/BOINC-Setup.po                        |    6 +-
 locale/ja/BOINC-Drupal.po                          |  176 ++
 locale/ja/BOINC-Manager.mo                         |  Bin 94173 -> 91374 bytes
 locale/ja/BOINC-Manager.po                         | 1836 +++++------
 locale/ja/BOINC-Project-Generic.po                 |  134 +-
 locale/ka/BOINC-Client.mo                          |  Bin 0 -> 7862 bytes
 locale/ka/BOINC-Client.po                          |  162 +
 locale/ka/BOINC-Setup.mo                           |  Bin 0 -> 4823 bytes
 locale/ka/BOINC-Setup.po                           |  118 +
 locale/ko/BOINC-Drupal.po                          |  120 +
 locale/ko/BOINC-Manager.mo                         |  Bin 84499 -> 81851 bytes
 locale/ko/BOINC-Manager.po                         | 1834 +++++------
 locale/ko/BOINC-Project-Generic.po                 |    2 +-
 locale/ko/BOINC-Web.mo                             |  Bin 38750 -> 38731 bytes
 locale/ko/BOINC-Web.po                             |    6 +-
 locale/nl/BOINC-Web.mo                             |  Bin 36961 -> 36942 bytes
 locale/nl/BOINC-Web.po                             |    6 +-
 locale/pt_PT/BOINC-Manager.mo                      |  Bin 81599 -> 79161 bytes
 locale/pt_PT/BOINC-Manager.po                      | 1944 ++++++------
 locale/pt_PT/BOINC-Project-Generic.po              | 3290 ++++++++++---------
 locale/ro/BOINC-Setup.mo                           |  Bin 3164 -> 3145 bytes
 locale/ro/BOINC-Setup.po                           |    6 +-
 locale/ru/BOINC-Drupal.po                          |  176 ++
 locale/ru/BOINC-Manager.mo                         |  Bin 108472 -> 105443 bytes
 locale/ru/BOINC-Manager.po                         | 1836 +++++------
 locale/ru/BOINC-Project-Generic.po                 |    4 +-
 locale/ru/BOINC-Setup.mo                           |  Bin 3890 -> 3890 bytes
 locale/ru/BOINC-Setup.po                           |    2 +-
 locale/ru/BOINC-Web.mo                             |  Bin 50306 -> 50370 bytes
 locale/ru/BOINC-Web.po                             |    4 +-
 locale/sk/BOINC-Drupal.po                          | 1519 +++++++++
 locale/sk/BOINC-Manager.mo                         |  Bin 79904 -> 77639 bytes
 locale/sk/BOINC-Manager.po                         | 1862 +++++------
 locale/sk/BOINC-Project-Generic.po                 |   24 +-
 locale/templates/BOINC-Drupal.pot                  | 2001 ++++++++++++
 locale/templates/BOINC-Manager.pot                 | 2098 ++++++------
 locale/tr/BOINC-Web.mo                             |  Bin 36922 -> 36925 bytes
 locale/tr/BOINC-Web.po                             |    8 +-
 locale/uk/BOINC-Setup.mo                           |  Bin 3890 -> 3871 bytes
 locale/uk/BOINC-Setup.po                           |    6 +-
 locale/uk/BOINC-Web.mo                             |  Bin 49089 -> 49070 bytes
 locale/uk/BOINC-Web.po                             |    6 +-
 locale/zh_CN/BOINC-Drupal.po                       | 1432 +++++++++
 locale/zh_CN/BOINC-Manager.mo                      |  Bin 75519 -> 73359 bytes
 locale/zh_CN/BOINC-Manager.po                      | 1835 +++++------
 locale/zh_CN/BOINC-Project-Generic.po              | 3301 ++++++++++---------
 locale/zh_TW/BOINC-Manager.mo                      |  Bin 73142 -> 73148 bytes
 locale/zh_TW/BOINC-Manager.po                      |    4 +-
 locale/zh_TW/BOINC-Web.mo                          |  Bin 32720 -> 32720 bytes
 locale/zh_TW/BOINC-Web.po                          |    2 +-
 samples/example_app/MakeMacExample.sh              |    2 +-
 samples/example_app/Makefile_mac                   |    2 +
 samples/example_app/Makefile_mac2                  |    5 +-
 samples/example_app/ReadMe.txt                     |   21 +
 samples/gfx_html/browserctrl_win.cpp               |    6 +-
 samples/openclapp/Makefile_mac                     |    3 +
 samples/openclapp/ReadMe.txt                       |   12 +-
 samples/vboxwrapper/BuildMacVboxWrapper.sh         |    6 +-
 samples/vboxwrapper/Makefile                       |    7 +-
 samples/vboxwrapper/Makefile_mac                   |   24 +-
 samples/vboxwrapper/ReadMe.txt                     |   17 +
 samples/vboxwrapper/vbox_common.cpp                |   55 +
 samples/vboxwrapper/vbox_common.h                  |   43 +-
 samples/vboxwrapper/vbox_mscom_impl.cpp            |  154 +-
 samples/vboxwrapper/vbox_vboxmanage.cpp            |   82 +-
 samples/vboxwrapper/vboxlog.cpp                    |   31 -
 samples/vboxwrapper/vboxlog.h                      |   21 -
 samples/vboxwrapper/vboxwrapper.cpp                |   40 +-
 .../vboxwrapper.xcodeproj/project.pbxproj          |    8 -
 samples/wrapper/Makefile_mac                       |    5 +-
 samples/wrapper/ReadMe.txt                         |   12 +
 samples/wrapper/wrapper.cpp                        |   10 +-
 sched/sched_assign.cpp                             |    5 +-
 sched/sched_score.h                                |    6 +-
 sched/validator.cpp                                |   12 +
 tools/create_work.cpp                              |    9 +-
 tools/make_project                                 |    3 +-
 version.h.in                                       |    2 +-
 zip/boinc_zip.xcodeproj/project.pbxproj            |   28 +-
 175 files changed, 26773 insertions(+), 19170 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27618d6..558a50e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,3 +149,4 @@ tools/sign_executable
 vda/ssim
 vda/vda
 vda/vdad
+/win_build/*.sdf
diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index 33c0b70..078d6cc 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.berkeley.boinc"
     android:installLocation="internalOnly"
-    android:versionCode="72"
-    android:versionName="7.5.0" > <!-- installation on SD card would break boot receiver -->
+    android:versionCode="116"
+    android:versionName="7.6.2" > <!-- installation on SD card would break boot receiver -->
 
 
     <!-- Add Google Play store metadata informing the store we can run on tablets and other large screen devices -->
diff --git a/android/BOINC/res/values-cs/strings.xml b/android/BOINC/res/values-cs/strings.xml
index ea98039..bc3a9f3 100644
--- a/android/BOINC/res/values-cs/strings.xml
+++ b/android/BOINC/res/values-cs/strings.xml
@@ -127,7 +127,7 @@
   <string name="tab_status">Stav</string>
   <string name="tab_projects">Projekty</string>
   <string name="tab_tasks">Úkoly</string>
-  <string name="tab_transfers">Přenos</string>
+  <string name="tab_transfers">Přenosy</string>
   <string name="tab_preferences">Předvolby</string>
   <string name="tab_notices">Zprávy</string>
   <string name="tab_desc">Navigace</string>
@@ -188,7 +188,7 @@
   <string name="prefs_cpu_other_load_suspension_description">Určuje kdy se BOINC pozastaví kvůli využití procesoru ostatními aplikacemi.</string>
   <string name="prefs_cpu_time_max_header">Omezení procesoru</string>
   <string name="prefs_cpu_time_max_description">Omezuje procesorový čas, který BOINC využívá pro počítání.</string>
-  <string name="prefs_memory_max_idle_header">limit paměti</string>
+  <string name="prefs_memory_max_idle_header">Limit paměti</string>
   <string name="prefs_memory_max_idle_description">Limituje množství paměti použitelné pro výpočet.</string>
   <string name="prefs_client_log_flags_header">Praporky zápisu BOINC klienta</string>
   <string name="prefs_gui_log_level_header">Úroveň protokolu GUI</string>
@@ -340,7 +340,8 @@
   <string name="about_name_long">Berkeley Open Infrastructure for Network Computing 
 (Berkeleyská Otevřená Infrastruktura pro Síťové Výpočty)</string>
   <string name="about_copyright">\u00A9 2003 – 2014 Univerzita v Kalifornii, Berkeley.</string>
-  <string name="about_copyright_reserved">Všechna práva vyhrazena.</string>
+  <string name="about_copyright_reserved">Všechna práva vyhrazena.
+Překlad do češtiny: petnek</string>
   <string name="about_credits">Díky patří Max Planck institutu pro gravitační fyziku, IBM Corporation a HTC Corporation za jejich podporu.</string>
   <!--notice notification-->
   <string name="notice_notification_single_header">Nové oznámení od</string>
diff --git a/android/BOINC/res/values-fr/strings.xml b/android/BOINC/res/values-fr/strings.xml
index 87453cb..3d61eb5 100644
--- a/android/BOINC/res/values-fr/strings.xml
+++ b/android/BOINC/res/values-fr/strings.xml
@@ -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>
diff --git a/android/BOINC/res/values-sk/strings.xml b/android/BOINC/res/values-sk/strings.xml
index b43ceba..6cd65a8 100644
--- a/android/BOINC/res/values-sk/strings.xml
+++ b/android/BOINC/res/values-sk/strings.xml
@@ -295,7 +295,7 @@
   <string name="suspend_batteries">Napojte vaše zariadenie na nabíjačku, aby výpočty mohli pokračovať.</string>
   <string name="suspend_screen_on">Vypnite obrazovku pre pokračovanie vo výpočtoch.</string>
   <string name="suspend_useractive">Užívateľ je aktívny.</string>
-  <string name="suspend_tod">Mimo časového rámcu výpočtov.</string>
+  <string name="suspend_tod">Mimo časového rámca výpočtov.</string>
   <string name="suspend_bm">BOINC meria výkon zariadenia...</string>
   <string name="suspend_disksize">Nedostatok miesta na disku.</string>
   <string name="suspend_cputhrottle">Plánované obmedzenie procesoru.</string>
diff --git a/android/BOINC/res/values-tr/strings.xml b/android/BOINC/res/values-tr/strings.xml
index 0941ad7..217924a 100644
--- a/android/BOINC/res/values-tr/strings.xml
+++ b/android/BOINC/res/values-tr/strings.xml
@@ -63,7 +63,7 @@
   <string name="attachproject_login_category_creation">Bu projede yeni misiniz:</string>
   <string name="attachproject_login_header_creation_enabled">Katılmak için bir hesap oluşturun:</string>
   <string name="attachproject_login_header_creation_client_disabled">Hesap oluşturmak için proje sitesini ziyaret edin:</string>
-  <string name="attachproject_login_header_creation_disabled">Proje şu anda yeni hesap oluşturulmasına müsaade etmiyor!</string>
+  <string name="attachproject_login_header_creation_disabled">Bu proje şu anda yeni hesapları kabul etmiyor.</string>
   <string name="attachproject_login_button_registration">Kayıt ol</string>
   <string name="attachproject_login_button_login">Giriş yap</string>
   <string name="attachproject_login_button_forgotpw">Parolamı unuttum</string>
@@ -306,7 +306,7 @@
   <string name="suspend_network_quota">BOINC, internet kullanım kotasına ulaştı.</string>
   <string name="suspend_os">Android tarafından durduruldu.</string>
   <string name="suspend_wifi">WiFi\'a bağlı değil.</string>
-  <string name="suspend_battery_charging">Hesaplamaya devam etmeden önce pilin şarj olması lazım.</string>
+  <string name="suspend_battery_charging">Pilin şarj olması bekleniyor.</string>
   <string name="suspend_battery_charging_long">Hesaplama, pil seviyesi şuna ulaştğında başlayacak:</string>
   <string name="suspend_battery_charging_long2"></string>
   <string name="suspend_battery_charging_current">şu anda</string>
diff --git a/android/BOINC/res/values-zh-rTW/strings.xml b/android/BOINC/res/values-zh-rTW/strings.xml
index 82885f5..678e42b 100644
--- a/android/BOINC/res/values-zh-rTW/strings.xml
+++ b/android/BOINC/res/values-zh-rTW/strings.xml
@@ -42,7 +42,7 @@
   <string name="attachproject_hint_projectwebsite_science">更深入了解科學</string>
   <string name="attachproject_hint_projectwebsite_stats">查看貢獻統計</string>
   <string name="attachproject_hint_projectwebsite_community">與其他參與者互動</string>
-  <string name="attachproject_hint_platforms_header">BOINC也支援電腦及筆電,造訪 boinc.berkeley.edu 了解更多資訊。</string>
+  <string name="attachproject_hint_platforms_header">BOINC 也支援電腦及筆電,造訪 boinc.berkeley.edu 了解更多資訊。</string>
   <!--project login-->
   <string name="attachproject_login_loading">正連線到專案伺服器...</string>
   <string name="attachproject_login_image_description">專案標誌。</string>
@@ -287,25 +287,25 @@
   <!--eventlog tab strings-->
   <string name="eventlog_loading">載入紀錄訊息中...</string>
   <string name="eventlog_client_header">用戶端訊息</string>
-  <string name="eventlog_gui_header">GUI訊息</string>
+  <string name="eventlog_gui_header">GUI 訊息</string>
   <string name="eventlog_copy_toast">紀錄已複製到剪貼簿。</string>
-  <string name="eventlog_email_subject">Android的BOINC事件紀錄:</string>
+  <string name="eventlog_email_subject">Android 的 BOINC 事件紀錄:</string>
   <!--suspend reasons-->
   <string name="suspend_unknown">已暫停運算。</string>
   <string name="suspend_batteries">裝置連接到充電器時繼續運算。</string>
   <string name="suspend_screen_on">關閉螢幕繼續運算。</string>
   <string name="suspend_useractive">使用者處於活躍狀態。</string>
   <string name="suspend_tod">超出運算期限。</string>
-  <string name="suspend_bm">BOINC正在測試您的裝置效能...</string>
+  <string name="suspend_bm">BOINC 正在測試您的裝置效能...</string>
   <string name="suspend_disksize">儲存空間不足。</string>
-  <string name="suspend_cputhrottle">安排CPU的使用。</string>
+  <string name="suspend_cputhrottle">安排 CPU 的使用。</string>
   <string name="suspend_noinput">最近沒有使用者活動。</string>
   <string name="suspend_delay">初始化延遲。</string>
-  <string name="suspend_exclusiveapp">有衝突的程式正在執行。</string>
+  <string name="suspend_exclusiveapp">有互斥的程式正在執行。</string>
   <string name="suspend_cpu">您的裝置忙於其他程式。</string>
-  <string name="suspend_network_quota">BOINC已達到網路傳輸上限。</string>
-  <string name="suspend_os">被Android系統停止。</string>
-  <string name="suspend_wifi">沒有連線到WiFi。</string>
+  <string name="suspend_network_quota">BOINC 已達到網路傳輸上限。</string>
+  <string name="suspend_os">被 Android 系統停止。</string>
+  <string name="suspend_wifi">沒有連線到 WiFi。</string>
   <string name="suspend_battery_charging">等待電池充電。</string>
   <string name="suspend_battery_charging_long">充電時將會繼續運算</string>
   <string name="suspend_battery_charging_long2"></string>
@@ -327,7 +327,7 @@
   <string name="menu_emailto">用電子郵件傳送</string>
   <string name="menu_copy">複製到剪貼簿</string>
   <string name="menu_eventlog">事件記錄檔</string>
-  <string name="menu_exit">退出BOINC</string>
+  <string name="menu_exit">退出 BOINC</string>
   <string name="menu_run_mode_disable">暫停</string>
   <string name="menu_run_mode_enable">繼續</string>
   <string name="menu_about">關於</string>
@@ -337,24 +337,24 @@
   <string name="about_title">關於</string>
   <string name="about_name">BOINC</string>
   <string name="about_version">版本</string>
-  <string name="about_name_long">柏克萊開放式網絡運算平台</string>
+  <string name="about_name_long">柏克萊開放式網路運算平台</string>
   <string name="about_copyright">\u00A9 2003–2014 University of California, Berkeley.</string>
   <string name="about_copyright_reserved">All Rights Reserved.</string>
-  <string name="about_credits">特別感謝Max Planck Institute for Gravitational Physics,IBM Corporation和HTC Corporation的技術支援。</string>
+  <string name="about_credits">特別感謝 Max Planck Institute for Gravitational Physics, IBM Corporation 和 HTC Corporation 的技術支援。</string>
   <!--notice notification-->
   <string name="notice_notification_single_header">新訊息來自</string>
   <!--e.g. New notice from SETI at HOME-->
   <string name="notice_notification_multiple_header">新訊息</string>
   <!--e.g. 3 new notices-->
   <!--multi BOINC compitability-->
-  <string name="nonexcl_dialog_header">偵測到志願運算APP</string>
-  <string name="nonexcl_dialog_text">有其他志願運算APP正在此裝置執行。只容許一個版本執行。</string>
+  <string name="nonexcl_dialog_header">偵測到志願運算 APP</string>
+  <string name="nonexcl_dialog_text">有其它志願運算 APP 正在此裝置執行。只容許一個版本執行。</string>
   <string name="nonexcl_dialog_exit">退出</string>
   <!--social integration-->
   <string name="social_invite_button">邀請好友</string>
   <string name="social_invite_intent_title">您想如何分享?</string>
   <string name="social_invite_content_title">我正在用智慧型手機研究科學!</string>
-  <string name="social_invite_content_body">我的%1$s正在為科學運算。希望您加入!APP下載:%2$s</string>
+  <string name="social_invite_content_body">我的 %1$s 正在為科學運算。希望您加入! APP 下載: %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>
diff --git a/build/getWxWidgets.sh b/build/getWxWidgets.sh
deleted file mode 100755
index 273a199..0000000
--- a/build/getWxWidgets.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -x
-
-## Travis-CI support script to built a specific wxWidgets version
-## This script checks if a cached version is available and builts one if not.
-## The directory is cached by Travis-CI for all subsequent runs of the VM
-
-# change to correct working directory because the script is called like: ./build/getWxWidgets.sh
-cd ./build
-
-# if the versioning changes try to delete the old directory and change .travis.yml to cache the new directory
-if [ ! -e "wxWidgets-3.0.2/build_complete" ]; then
-  wget https://sourceforge.net/projects/wxwindows/files/3.0.2/wxWidgets-3.0.2.tar.bz2
-  tar -xf wxWidgets-3.0.2.tar.bz2
-  cd wxWidgets-3.0.2
-  mkdir buildgtk
-  cd buildgtk
-  ../configure --with-gtk --disable-shared --enable-webview --disable-gtktest --disable-sdltest
-  make
-  cd ..
-  touch build_complete
-  cd ..
-fi
-
-# change back to root directory
-cd ..
diff --git a/client/app.cpp b/client/app.cpp
index 9bbadd2..eaa52a5 100644
--- a/client/app.cpp
+++ b/client/app.cpp
@@ -553,26 +553,40 @@ bool ACTIVE_TASK_SET::is_slot_dir_in_use(char* dir) {
     return false;
 }
 
-// Get a free slot,
-// and make a slot dir if needed
+// Get a free slot:
+// either find an unused an empty slot dir,
+// or create a new slot dir if needed
 //
 int ACTIVE_TASK::get_free_slot(RESULT* rp) {
 #ifndef SIM
     int j, retval;
     char path[MAXPATHLEN];
 
+    // scan slot numbers: slots/0, slots/1, etc.
+    //
     for (j=0; ; j++) {
+        // skip slots that are in use by existing jobs
+        //
         if (gstate.active_tasks.is_slot_in_use(j)) continue;
 
-        // make sure we can make an empty directory for this slot
-        //
         get_slot_dir(j, path, sizeof(path));
         if (boinc_file_exists(path)) {
             if (is_dir(path)) {
+                // If the directory exists, try to clean it out.
+                // If this succeeds, use it.
+                //
                 retval = client_clean_out_dir(path, "get_free_slot()");
                 if (!retval) break;
+                if (log_flags.slot_debug) {
+                    msg_printf(rp->project, MSG_INFO,
+                        "[slot] failed to clean out dir: %s",
+                        boincerror(retval)
+                    );
+                }
             }
         } else {
+            // directory doesn't exist - create one
+            //
             retval = make_slot_dir(j);
             if (!retval) break;
         }
@@ -588,7 +602,9 @@ int ACTIVE_TASK::get_free_slot(RESULT* rp) {
     }
     slot = j;
     if (log_flags.slot_debug) {
-        msg_printf(rp->project, MSG_INFO, "[slot] assigning slot %d to %s", j, rp->name);
+        msg_printf(rp->project, MSG_INFO,
+            "[slot] assigning slot %d to %s", j, rp->name
+        );
     }
 #endif
     return 0;
@@ -1112,7 +1128,10 @@ void* throttler(void*) {
 
     while (1) {
         client_mutex.lock();
-        if (gstate.tasks_suspended || gstate.global_prefs.cpu_usage_limit > 99) {
+        if (gstate.tasks_suspended
+            || gstate.global_prefs.cpu_usage_limit > 99
+            || gstate.global_prefs.cpu_usage_limit < 0.005
+            ) {
             client_mutex.unlock();
             boinc_sleep(10);
             continue;
diff --git a/client/app_control.cpp b/client/app_control.cpp
index 73ca70d..b73bc91 100644
--- a/client/app_control.cpp
+++ b/client/app_control.cpp
@@ -805,7 +805,7 @@ bool ACTIVE_TASK::check_max_disk_exceeded() {
                 "Aborting task %s: exceeded disk limit: %.2fMB > %.2fMB\n",
                 result->name, disk_usage/MEGA, max_disk_usage/MEGA
             );
-            abort_task(EXIT_DISK_LIMIT_EXCEEDED, "Maximum disk usage exceeded");
+            abort_task(EXIT_DISK_LIMIT_EXCEEDED, "Disk usage limit exceeded");
             return true;
         }
     }
@@ -1478,23 +1478,14 @@ void ACTIVE_TASK_SET::get_msgs() {
     }
     last_time = gstate.now;
 
-    double et_diff, et_diff_throttle;
-    switch (gstate.suspend_reason) {
-    case 0:
-    case SUSPEND_REASON_CPU_THROTTLE:
-        et_diff = delta_t;
-        et_diff_throttle = delta_t * gstate.global_prefs.cpu_usage_limit/100;
-        break;
-    default:
-        et_diff = et_diff_throttle = 0;
-        break;
-    }
+    double et_diff = delta_t;
+    double et_diff_throttle = delta_t * gstate.global_prefs.cpu_usage_limit/100;
 
     for (i=0; i<active_tasks.size(); i++) {
         atp = active_tasks[i];
         if (!atp->process_exists()) continue;
         old_time = atp->checkpoint_cpu_time;
-        if (atp->scheduler_state == CPU_SCHED_SCHEDULED) {
+        if (atp->task_state() == PROCESS_EXECUTING) {
             double x = atp->result->dont_throttle()?et_diff:et_diff_throttle;
             atp->elapsed_time += x;
             atp->wup->project->elapsed_time += x;
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 755f1de..feb053f 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -511,6 +511,10 @@ int CLIENT_STATE::init() {
     set_ncpus();
     show_host_info();
 
+    // this follows parse_state_file() because that's where we read project names
+    //
+    sort_projects_by_name();
+
     // check for app_config.xml files in project dirs
     //
     check_app_config();
diff --git a/client/client_state.h b/client/client_state.h
index 74ff594..a0550cb 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -457,7 +457,7 @@ struct CLIENT_STATE {
     int write_file_transfers_gui(MIOFILE&);
     int write_tasks_gui(MIOFILE&, bool);
     void sort_results();
-    void sort_projects();
+    void sort_projects_by_name();
 
 // --------------- cs_trickle.cpp:
     int read_trickle_files(PROJECT*, FILE*);
diff --git a/client/cs_account.cpp b/client/cs_account.cpp
index 155c69a..2293caf 100644
--- a/client/cs_account.cpp
+++ b/client/cs_account.cpp
@@ -353,7 +353,6 @@ int CLIENT_STATE::parse_account_files() {
             }
         }
     }
-    sort_projects();
     return 0;
 }
 
@@ -575,7 +574,7 @@ int CLIENT_STATE::add_project(
     retval = make_project_dir(*project);
     if (retval) return retval;
     projects.push_back(project);
-    sort_projects();
+    sort_projects_by_name();
     project->sched_rpc_pending = RPC_REASON_INIT;
     set_client_state_dirty("Add project");
     return 0;
diff --git a/client/cs_statefile.cpp b/client/cs_statefile.cpp
index dbf80da..2c8c764 100644
--- a/client/cs_statefile.cpp
+++ b/client/cs_statefile.cpp
@@ -572,7 +572,7 @@ static inline bool project_name_compare(PROJECT* p0, PROJECT* p1) {
     return strcasecmp(p0->project_name, p1->project_name) < 0;
 }
 
-void CLIENT_STATE::sort_projects() {
+void CLIENT_STATE::sort_projects_by_name() {
     std::sort(
         projects.begin(),
         projects.end(),
@@ -878,7 +878,8 @@ int CLIENT_STATE::parse_app_info(PROJECT* p, FILE* in) {
             // check that the file is actually there
             //
             get_pathname(fip, path, sizeof(path));
-            if (!boinc_file_exists(path)) {
+            double size;
+            if (file_size(path, size)) {
                 safe_strcpy(buf,
                     _("File referenced in app_info.xml does not exist: ")
                 );
@@ -887,6 +888,7 @@ int CLIENT_STATE::parse_app_info(PROJECT* p, FILE* in) {
                 delete fip;
                 continue;
             }
+            fip->nbytes = size;
             fip->status = FILE_PRESENT;
             fip->anonymous_platform_file = true;
             file_infos.push_back(fip);
diff --git a/client/gpu_detect.cpp b/client/gpu_detect.cpp
index 1c2b067..d69299d 100644
--- a/client/gpu_detect.cpp
+++ b/client/gpu_detect.cpp
@@ -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) {
diff --git a/client/hostinfo_win.cpp b/client/hostinfo_win.cpp
index b0f2c92..2a3856b 100644
--- a/client/hostinfo_win.cpp
+++ b/client/hostinfo_win.cpp
@@ -70,19 +70,19 @@
 #define PRODUCT_ENTERPRISE_N_EVALUATION             0x00000054
 #endif
 #ifndef PRODUCT_EMBEDDED_AUTOMOTIVE
-#define PRODUCT_EMBEDDED_AUTOMOTIVE					0x00000055
+#define PRODUCT_EMBEDDED_AUTOMOTIVE                 0x00000055
 #endif
 #ifndef PRODUCT_EMBEDDED_INDUSTRY_A
-#define PRODUCT_EMBEDDED_INDUSTRY_A					0x00000056
+#define PRODUCT_EMBEDDED_INDUSTRY_A                 0x00000056
 #endif
-#ifndef PRODUCT_THINPC								
-#define PRODUCT_THINPC								0x00000057
+#ifndef PRODUCT_THINPC
+#define PRODUCT_THINPC                              0x00000057
 #endif
 #ifndef PRODUCT_EMBEDDED_A
-#define PRODUCT_EMBEDDED_A							0x00000058
+#define PRODUCT_EMBEDDED_A                          0x00000058
 #endif
 #ifndef PRODUCT_EMBEDDED_INDUSTRY
-#define PRODUCT_EMBEDDED_INDUSTRY					0x00000059
+#define PRODUCT_EMBEDDED_INDUSTRY                   0x00000059
 #endif
 #ifndef PRODUCT_EMBEDDED_E
 #define PRODUCT_EMBEDDED_E                          0x0000005A
@@ -99,28 +99,27 @@
 #ifndef PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER
 #define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER  0x00000060
 #endif
-#ifndef PRODUCT_CORE_ARM                            
+#ifndef PRODUCT_CORE_ARM
 #define PRODUCT_CORE_ARM                            0x00000061
 #endif
-#ifndef PRODUCT_CORE_N                              
+#ifndef PRODUCT_CORE_N
 #define PRODUCT_CORE_N                              0x00000062
 #endif
-#ifndef PRODUCT_CORE_COUNTRYSPECIFIC               
+#ifndef PRODUCT_CORE_COUNTRYSPECIFIC
 #define PRODUCT_CORE_COUNTRYSPECIFIC                0x00000063
 #endif
-#ifndef PRODUCT_CORE_SINGLELANGUAGE                 
+#ifndef PRODUCT_CORE_SINGLELANGUAGE
 #define PRODUCT_CORE_SINGLELANGUAGE                 0x00000064
 #endif
-#ifndef PRODUCT_CORE                                
+#ifndef PRODUCT_CORE
 #define PRODUCT_CORE                                0x00000065
 #endif
-#ifndef PRODUCT_PROFESSIONAL_WMC                    
+#ifndef PRODUCT_PROFESSIONAL_WMC
 #define PRODUCT_PROFESSIONAL_WMC                    0x00000067
 #endif
 #ifndef PRODUCT_MOBILE_CORE
 #define PRODUCT_MOBILE_CORE                         0x00000068
 #endif
-// Windows NT 6.3
 #ifndef PRODUCT_EMBEDDED_INDUSTRY_EVAL
 #define PRODUCT_EMBEDDED_INDUSTRY_EVAL              0x00000069
 #endif
@@ -133,12 +132,79 @@
 #ifndef PRODUCT_EMBEDDED_E_EVAL
 #define PRODUCT_EMBEDDED_E_EVAL                     0x0000006C
 #endif
-#ifndef PRODUCT_CORE_SERVER
-#define PRODUCT_CORE_SERVER                         0x0000006D
+#ifndef PRODUCT_NANO_SERVER
+#define PRODUCT_NANO_SERVER                         0x0000006D
 #endif
 #ifndef PRODUCT_CLOUD_STORAGE_SERVER
 #define PRODUCT_CLOUD_STORAGE_SERVER                0x0000006E
 #endif
+#ifndef PRODUCT_CORE_CONNECTED
+#define PRODUCT_CORE_CONNECTED                      0x0000006F
+#endif
+#ifndef PRODUCT_PROFESSIONAL_STUDENT
+#define PRODUCT_PROFESSIONAL_STUDENT                0x00000070
+#endif
+#ifndef PRODUCT_CORE_CONNECTED_N
+#define PRODUCT_CORE_CONNECTED_N                    0x00000071
+#endif
+#ifndef PRODUCT_PROFESSIONAL_STUDENT_N
+#define PRODUCT_PROFESSIONAL_STUDENT_N              0x00000072
+#endif
+#ifndef PRODUCT_CORE_CONNECTED_SINGLELANGUAGE
+#define PRODUCT_CORE_CONNECTED_SINGLELANGUAGE       0x00000073
+#endif
+#ifndef PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC
+#define PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC      0x00000074
+#endif
+#ifndef PRODUCT_CONNECTED_CAR
+#define PRODUCT_CONNECTED_CAR                       0x00000075
+#endif
+#ifndef PRODUCT_INDUSTRY_HANDHELD
+#define PRODUCT_INDUSTRY_HANDHELD                   0x00000076
+#endif
+#ifndef PRODUCT_PPI_PRO
+#define PRODUCT_PPI_PRO                             0x00000077
+#endif
+#ifndef PRODUCT_ARM64_SERVER
+#define PRODUCT_ARM64_SERVER                        0x00000078
+#endif
+#ifndef PRODUCT_EDUCATION
+#define PRODUCT_EDUCATION                           0x00000079
+#endif
+#ifndef PRODUCT_EDUCATION_N
+#define PRODUCT_EDUCATION_N                         0x0000007A
+#endif
+#ifndef PRODUCT_IOTUAP
+#define PRODUCT_IOTUAP                              0x0000007B
+#endif
+#ifndef PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER
+#define PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER    0x0000007C
+#endif
+#ifndef PRODUCT_ENTERPRISE_S
+#define PRODUCT_ENTERPRISE_S                        0x0000007D
+#endif
+#ifndef PRODUCT_ENTERPRISE_S_N
+#define PRODUCT_ENTERPRISE_S_N                      0x0000007E
+#endif
+#ifndef PRODUCT_PROFESSIONAL_S
+#define PRODUCT_PROFESSIONAL_S                      0x0000007F
+#endif
+#ifndef PRODUCT_PROFESSIONAL_S_N
+#define PRODUCT_PROFESSIONAL_S_N                    0x00000080
+#endif
+#ifndef PRODUCT_ENTERPRISE_S_EVALUATION
+#define PRODUCT_ENTERPRISE_S_EVALUATION             0x00000081
+#endif
+#ifndef PRODUCT_ENTERPRISE_S_N_EVALUATION
+#define PRODUCT_ENTERPRISE_S_N_EVALUATION           0x00000082
+#endif
+
+
+// new Architecture(s)
+#ifndef PROCESSOR_ARCHITECTURE_ARM64
+#define PROCESSOR_ARCHITECTURE_ARM64            12
+#endif
+
 
 /* HAVE_DECL__XGETBV should be set by autoconf or in boinc_win.h */
 #if !defined(HAVE_DECL__XGETBV) || !HAVE_DECL__XGETBV
@@ -192,9 +258,9 @@ static void __cpuid(unsigned int cpuinfo[4], unsigned int type)  {
                               "=c" (cpuinfo[2]), "=d" (cpuinfo[3]) 
                             : "a" (type));
   #else
-      __asm__ __volatile__(".byte 0x0f, 0xa2" 
+      __asm__ __volatile__(".byte 0x0f, 0xa2"
                             : "=a" (cpuinfo[0]), "=b" (cpuinfo[1]), 
-                              "=c" (cpuinfo[2]), "=d" (cpuinfo[3]) 
+                              "=c" (cpuinfo[2]), "=d" (cpuinfo[3])
                             : "a" (type));
   #endif
 #elif defined(_MSC_VER)
@@ -296,16 +362,25 @@ int get_os_information(
     switch (osvi.dwPlatformId) {
         case VER_PLATFORM_WIN32_NT:
 
-			if ( osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 ) {
+            if ( osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 ) {
                 if( osvi.wProductType == VER_NT_WORKSTATION ) {
                     strcat(os_name, "Windows 10");
                 } else {
-                    strcat(os_name, "Windows Server 2015");
+                    strcat(os_name, "Windows Server 2016");
                 }
                 pGPI( 10, 0, 0, 0, &dwType);
             }
 
-			if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3 ) {
+            if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 4 ) {
+                if( osvi.wProductType == VER_NT_WORKSTATION ) {
+                    strcat(os_name, "Windows 10 Beta");
+                } else {
+                    strcat(os_name, "Windows 10 Server Beta");
+                }
+                pGPI( 6, 4, 0, 0, &dwType);
+            }
+
+            if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3 ) {
                 if( osvi.wProductType == VER_NT_WORKSTATION ) {
                     strcat(os_name, "Windows 8.1");
                 } else {
@@ -405,95 +480,126 @@ int get_os_information(
                 // Test for the workstation type.
                 if ( osvi.wProductType == VER_NT_WORKSTATION ) {
 
-                    if( (osvi.dwMajorVersion == 6) ) {
+                    // all NT6 or higher have dwType (Vista,7,8,81,10...)
+                    if( (osvi.dwMajorVersion >= 6) ) {
                         switch(dwType) {
-                            case PRODUCT_ULTIMATE:
-                               strcat(szSKU, "Ultimate ");
-                               break;
-                            case PRODUCT_PROFESSIONAL:
-                               strcat(szSKU, "Professional ");
-                               break;
-                            case PRODUCT_HOME_PREMIUM:
-                               strcat(szSKU, "Home Premium ");
-                               break;
-                            case PRODUCT_HOME_BASIC:
-                               strcat(szSKU, "Home Basic ");
-                               break;
-                            case PRODUCT_ENTERPRISE:
-                               strcat(szSKU, "Enterprise ");
-                               break;
                             case PRODUCT_BUSINESS:
-                               strcat(szSKU, "Business ");
-                               break;
-                            case PRODUCT_STARTER:
-                               strcat(szSKU, "Starter ");
-                               break;
-                            case PRODUCT_PROFESSIONAL_N:
-                               strcat(szSKU, "Professional N ");
-                               break;
-                            case PRODUCT_HOME_PREMIUM_N:
-                               strcat(szSKU, "Home Premium N ");
-                               break;
-                            case PRODUCT_HOME_BASIC_N:
-                               strcat(szSKU, "Home Basic N ");
-                               break;
-                            case PRODUCT_ULTIMATE_N:
-                               strcat(szSKU, "Ultimate N ");
-                               break;
-                            case PRODUCT_ENTERPRISE_N:
-                               strcat(szSKU, "Enterprise N ");
-                               break;
+                                strcat(szSKU, "Business ");
+                                break;
                             case PRODUCT_BUSINESS_N:
-                               strcat(szSKU, "Business N ");
-                               break;
-                            case PRODUCT_PROFESSIONAL_E:
-                               strcat(szSKU, "Professional E ");
-                               break;
-                            case PRODUCT_HOME_PREMIUM_E:
-                               strcat(szSKU, "Home Premium E ");
-                               break;
-                            case PRODUCT_HOME_BASIC_E:
-                               strcat(szSKU, "Home Basic E ");
-                               break;
-                            case PRODUCT_ULTIMATE_E:
-                               strcat(szSKU, "Ultimate E ");
-                               break;
+                                strcat(szSKU, "Business N ");
+                                break;
+                            case PRODUCT_CORE:
+                                strcat(szSKU, "Core ");
+                                break;
+                            case PRODUCT_CORE_ARM:
+                                strcat(szSKU, "Core ");
+                                break;
+                            case PRODUCT_CORE_COUNTRYSPECIFIC:
+                                strcat(szSKU, "Core ");  // specific W8 for China
+                                break;
+                            case PRODUCT_CORE_N:
+                                strcat(szSKU, "Core N ");
+                                break;
+                            case PRODUCT_EDUCATION:
+                                strcat(szSKU, "Education ");
+                                break;
+                            case PRODUCT_EDUCATION_N:
+                                strcat(szSKU, "Education N ");
+                                break;
+                            case PRODUCT_EMBEDDED:
+                                strcat(szSKU, "Embedded Standard ");
+                                break;
+                            case PRODUCT_ENTERPRISE:
+                                strcat(szSKU, "Enterprise ");
+                                break;
                             case PRODUCT_ENTERPRISE_E:
-                               strcat(szSKU, "Enterprise E ");
-                               break;
+                                strcat(szSKU, "Enterprise E ");
+                                break;
+                            case PRODUCT_ENTERPRISE_N:
+                                strcat(szSKU, "Enterprise N ");
+                                break;
+                            case PRODUCT_ENTERPRISE_N_EVALUATION:
+                                strcat(szSKU, "Enterprise N (Evaluation) ");
+                                break;
+                            case PRODUCT_HOME_BASIC:
+                                strcat(szSKU, "Home Basic ");
+                                break;
+                            case PRODUCT_HOME_BASIC_E:
+                                strcat(szSKU, "Home Basic E ");
+                                break;
+                            case PRODUCT_HOME_BASIC_N:
+                                strcat(szSKU, "Home Basic N ");
+                                break;
+                            case PRODUCT_HOME_PREMIUM:
+                                strcat(szSKU, "Home Premium ");
+                                break;
+                            case PRODUCT_HOME_PREMIUM_E:
+                                strcat(szSKU, "Home Premium E ");
+                                break;
+                            case PRODUCT_HOME_PREMIUM_N:
+                                strcat(szSKU, "Home Premium N ");
+                                break;
+                            case PRODUCT_IOTUAP:
+                                strcat(szSKU, "Internet of Things ");
+                                break;
                             case PRODUCT_PRERELEASE:
                                 strcat(szSKU, "Developer Preview ");
                                 break;
                             case PRODUCT_PRERELEASE_N:
                                 strcat(szSKU, "Developer Preview N ");
                                 break;
-							case PRODUCT_EMBEDDED:
-								strcat(szSKU, "Embedded Standard ");
-								break;
-							case PRODUCT_THINPC:    
-								strcat(szSKU, "ThinPC ");
-								break;
-							case PRODUCT_CORE:
-								strcat(szSKU, "Core ");
-								break;
-							case PRODUCT_CORE_N:
-								strcat(szSKU, "Core N ");
-								break;
-							case PRODUCT_CORE_ARM:
-								strcat(szSKU, "Core "); // just Core because Boinc will add ARM later
-								break;
-							case PRODUCT_PROFESSIONAL_WMC:
-								strcat(szSKU, "Professional with Media Center ");
-								break;
-							
-                       }
+                            case PRODUCT_PROFESSIONAL:
+                                strcat(szSKU, "Professional ");
+                                break;
+                            case PRODUCT_PROFESSIONAL_E:
+                                strcat(szSKU, "Professional E ");
+                                break;
+                            case PRODUCT_PROFESSIONAL_N:
+                                strcat(szSKU, "Professional N ");
+                                break;
+                            case PRODUCT_PROFESSIONAL_S:
+                                strcat(szSKU, "Professional S ");
+                                break;
+                            case PRODUCT_PROFESSIONAL_S_N:
+                                strcat(szSKU, "Professional SN "); //??
+                                break;
+                            case PRODUCT_PROFESSIONAL_WMC:
+                                strcat(szSKU, "Professional with Media Center ");
+                                break;
+                            case PRODUCT_STARTER:
+                                strcat(szSKU, "Starter ");
+                                break;
+                            case PRODUCT_STARTER_E:
+                                strcat(szSKU, "Starter E ");
+                                break;
+                            case PRODUCT_STARTER_N:
+                                strcat(szSKU, "Starter N ");
+                                break;
+                            case PRODUCT_THINPC:
+                                strcat(szSKU, "ThinPC ");
+                                break;
+                            case PRODUCT_ULTIMATE:
+                                strcat(szSKU, "Ultimate ");
+                                break;
+                            case PRODUCT_ULTIMATE_E:
+                                strcat(szSKU, "Ultimate E ");
+                                break;
+                            case PRODUCT_ULTIMATE_N:
+                                strcat(szSKU, "Ultimate N ");
+                                break;
+                        }
+
                     } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) ) {
+
                         if( osvi.wSuiteMask & VER_SUITE_PERSONAL ) {
                             strcat(szSKU, "Home ");
                         } else {
                             strcat(szSKU, "Professional ");
                         }
+
                     } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) ) {
+
                         if( osvi.wSuiteMask & VER_SUITE_PERSONAL ) {
                             strcat(szSKU, "Home ");
                         } else if( GetSystemMetrics(SM_TABLETPC) ) {
@@ -505,35 +611,119 @@ int get_os_information(
                         } else {
                             strcat(szSKU, "Professional ");
                         }
+
                     } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) ) {
+
                         strcat(szSKU, "Professional ");
+
                     } else if(  (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) ) {
+
                         strcat(szSKU, "Workstation ");
+
                     }
                 }
 
 				// Test for the server type.
                 else if ( (osvi.wProductType == VER_NT_SERVER) || (osvi.wProductType == VER_NT_DOMAIN_CONTROLLER) ) {
-                    if( (osvi.dwMajorVersion == 6) ) {
 
+                    // all NT6 or higher (Server 2008,2008r2,2012,2012r2,2015...)
+                    if( (osvi.dwMajorVersion >= 6) ) {
                         switch(dwType) {
+                            case PRODUCT_ARM64_SERVER:
+                                strcat(szSKU, "ARM64 Server ");
+                                break;
+                            case PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER:
+                                strcat(szSKU, "Cloud Host Infrastructure Server ");
+                                break;
+                            case PRODUCT_CLOUD_STORAGE_SERVER:
+                                strcat(szSKU, "Cloud Storage Server ");
+                                break;
                             case PRODUCT_CLUSTER_SERVER:
-                               strcat( szSKU, "Cluster Server ");
-                               break;
+                                strcat(szSKU, "Cluster Server ");
+                                break;
+                            case PRODUCT_CLUSTER_SERVER_V:
+                                strcat(szSKU, "Cluster Server (without Hyper-V) ");
+                                break;
+                            case PRODUCT_DATACENTER_EVALUATION_SERVER:
+                                strcat(szSKU, "Datacenter (Evaluation) ");
+                                break;
                             case PRODUCT_DATACENTER_SERVER:
-                               strcat( szSKU, "Datacenter ");
-                               break;
+                                strcat(szSKU, "Datacenter ");
+                                break;
                             case PRODUCT_DATACENTER_SERVER_CORE:
-                               strcat( szSKU, "Datacenter (core installation) ");
-                               break;
+                                strcat(szSKU, "Datacenter (core installation) ");
+                                break;
+                            case PRODUCT_DATACENTER_SERVER_CORE_V:
+                                strcat(szSKU, "Datacenter (core installation without Hyper-V) ");
+                                break;
+                            case PRODUCT_DATACENTER_SERVER_V:
+                                strcat(szSKU, "Datacenter (without Hyper-V) ");
+                                break;
+                            case PRODUCT_ENTERPRISE_EVALUATION:
+                                strcat(szSKU, "Enterprise (Evaluation) ");
+                                break;
                             case PRODUCT_ENTERPRISE_SERVER:
-                               strcat( szSKU, "Enterprise ");
-                               break;
+                                strcat(szSKU, "Enterprise ");
+                                break;
                             case PRODUCT_ENTERPRISE_SERVER_CORE:
-                               strcat( szSKU, "Enterprise (core installation) ");
-                               break;
+                                strcat(szSKU, "Enterprise (core installation) ");
+                                break;
+                            case PRODUCT_ENTERPRISE_SERVER_CORE_V:
+                                strcat(szSKU, "Enterprise (core installation without Hyper-V) ");
+                                break;
                             case PRODUCT_ENTERPRISE_SERVER_IA64:
-                               strcat( szSKU, "Enterprise ");
+                                strcat(szSKU, "Enterprise ");
+                                break;
+                            case PRODUCT_ENTERPRISE_SERVER_V:
+                                strcat(szSKU, "Enterprise (without Hyper-V) ");
+                                break;
+                            case PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL:
+                                strcat(szSKU, "Essential Server Solution Additional ");
+                                break;
+                            case PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC:
+                                strcat(szSKU, "Essential Server Solution Additional SVC ");
+                                break;
+                            case PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT:
+                                strcat(szSKU, "Essential Server Solution Management ");
+                                break;
+                            case PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC:
+                                strcat(szSKU, "Essential Server Solution Management SVC ");
+                                break;
+                            case PRODUCT_HOME_PREMIUM_SERVER:
+                                strcat(szSKU, "Home Server 2011");
+                                break;
+                            case PRODUCT_HOME_SERVER:
+                                strcat(szSKU, "Storage Server Essentials ");
+                                break;
+                            case PRODUCT_HYPERV:
+                                strcat(szSKU, "Hyper-V ");
+                                break;
+                            case PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT:
+                                strcat(szSKU, "Essential Business Server Management Server ");
+                                break;
+                            case PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING:
+                                strcat(szSKU, "Essential Business Server Messaging Server ");
+                                break;
+                            case PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY:
+                                strcat(szSKU, "Essential Business Server Security Server ");
+                                break;
+                            case PRODUCT_MULTIPOINT_PREMIUM_SERVER:
+                               strcat( szSKU, "MultiPoint Server Premium ");
+                               break;
+                            case PRODUCT_MULTIPOINT_STANDARD_SERVER:
+                               strcat( szSKU, "MultiPoint Server Standard ");
+                               break;
+                            case PRODUCT_NANO_SERVER:
+                                strcat(szSKU, "Nano Server ");
+                                break;
+                            case PRODUCT_SERVER_FOR_SMALLBUSINESS:
+                               strcat( szSKU, "Essential Server Solutions ");
+                               break;
+                            case PRODUCT_SERVER_FOR_SMALLBUSINESS_V:
+                               strcat( szSKU, "Essential Server Solutions (without Hyper-V) ");
+                               break;
+                            case PRODUCT_SERVER_FOUNDATION:
+                               strcat( szSKU, "Foundation ");
                                break;
                             case PRODUCT_SMALLBUSINESS_SERVER:
                                strcat( szSKU, "Small Business Server");
@@ -541,42 +731,67 @@ int get_os_information(
                             case PRODUCT_SMALLBUSINESS_SERVER_PREMIUM:
                                strcat( szSKU, "Small Business Server Premium ");
                                break;
-                            case PRODUCT_STANDARD_SERVER:
-                               strcat( szSKU, "Standard ");
-                               break;
-                            case PRODUCT_STANDARD_SERVER_CORE:
-                               strcat( szSKU, "Standard (core installation) ");
+                            case PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE:
+                               strcat( szSKU, "Small Business Server Premium (core installation) ");
                                break;
-                            case PRODUCT_WEB_SERVER:
-                               strcat( szSKU, "Web Server ");
+                            case PRODUCT_SOLUTION_EMBEDDEDSERVER:
+                               strcat( szSKU, "MultiPoint Server ");
                                break;
-                            case PRODUCT_WEB_SERVER_CORE:
-                               strcat( szSKU, "Web Server (core installation) ");
+                            case PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE:
+                               strcat( szSKU, "MultiPoint Server (core installation) ");
                                break;
-                            case PRODUCT_HOME_SERVER:
-                               strcat( szSKU, "Home Server ");
+                            case PRODUCT_STANDARD_EVALUATION_SERVER:
+                                strcat(szSKU, "Standard (Evaluation) ");
+                                break;
+                            case PRODUCT_STANDARD_SERVER:
+                                strcat(szSKU, "Standard ");
+                                break;
+                            case PRODUCT_STANDARD_SERVER_CORE:
+                                strcat(szSKU, "Standard (core installation) ");
+                                break;
+                            case PRODUCT_STANDARD_SERVER_CORE_V:
+                                strcat(szSKU, "Standard (core installation without Hyper-V) ");
+                                break;
+                            case PRODUCT_STANDARD_SERVER_V:
+                                strcat(szSKU, "Standard (without Hyper-V) ");
+                                break;
+                            case PRODUCT_STORAGE_ENTERPRISE_SERVER:
+                               strcat( szSKU, "Storage Server Enterprise ");
                                break;
-                            case PRODUCT_HOME_PREMIUM_SERVER:
-                               strcat( szSKU, "Home Premium Server ");
+                            case PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE:
+                               strcat( szSKU, "Storage Server Enterprise (core installation) ");
                                break;
                             case PRODUCT_STORAGE_EXPRESS_SERVER:
                                strcat( szSKU, "Storage Server Express ");
                                break;
+                            case PRODUCT_STORAGE_EXPRESS_SERVER_CORE:
+                               strcat( szSKU, "Storage Server Express (core installation) ");
+                               break;
+                            case PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER:
+                               strcat( szSKU, "Storage Server Standard (Evaluation) ");
+                               break;
                             case PRODUCT_STORAGE_STANDARD_SERVER:
                                strcat( szSKU, "Storage Server Standard ");
                                break;
+                            case PRODUCT_STORAGE_STANDARD_SERVER_CORE:
+                               strcat( szSKU, "Storage Server Standard (core installation) ");
+                               break;
+                            case PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER:
+                               strcat( szSKU, "Storage Server Workgroup (Evaluation) ");
+                               break;
                             case PRODUCT_STORAGE_WORKGROUP_SERVER:
                                strcat( szSKU, "Storage Server Workgroup ");
                                break;
-                            case PRODUCT_STORAGE_ENTERPRISE_SERVER:
-                               strcat( szSKU, "Storage Server Enterprise ");
-                               break;
-                            case PRODUCT_SERVER_FOR_SMALLBUSINESS:
-                               strcat( szSKU, "Server For Small Business ");
+                            case PRODUCT_STORAGE_WORKGROUP_SERVER_CORE:
+                               strcat( szSKU, "Storage Server Workgroup (core installation) ");
                                break;
-                            case PRODUCT_HYPERV:
-								strcat( szSKU, "Hyper-V ");
-								break;
+                            case PRODUCT_WEB_SERVER:
+                                strcat(szSKU, "Web Server ");
+                                break;
+                            case PRODUCT_WEB_SERVER_CORE:
+                                strcat(szSKU, "Web Server (core installation) ");
+                                break;
+
                         }
 
                     } else if( (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) ) {
@@ -634,11 +849,14 @@ int get_os_information(
                     case PROCESSOR_ARCHITECTURE_AMD64:
                         strcat(szSKU, "x64 ");
                         break;
-					// could be needed for Windows RT Boinc ?
-					case PROCESSOR_ARCHITECTURE_ARM:
-						strcat(szSKU, "ARM");
-						break;
-					case PROCESSOR_ARCHITECTURE_UNKNOWN:
+                    // could be needed for Windows RT Boinc ?
+                    case PROCESSOR_ARCHITECTURE_ARM:
+                        strcat(szSKU, "ARM ");
+                        break;
+                    case PROCESSOR_ARCHITECTURE_ARM64:
+                        strcat(szSKU, "ARM64 ");
+                        break;
+                    case PROCESSOR_ARCHITECTURE_UNKNOWN:
                         strcat(szSKU, "Unknown ");
                         break;
                 }
@@ -1289,3 +1507,4 @@ bool HOST_INFO::users_idle(bool /*check_all_logins*/, double idle_time_to_run) {
     return seconds_idle > seconds_time_to_run;
 }
 
+
diff --git a/client/http_curl.cpp b/client/http_curl.cpp
index 5fea257..60efb8c 100644
--- a/client/http_curl.cpp
+++ b/client/http_curl.cpp
@@ -68,12 +68,17 @@ static bool got_expectation_failed = false;
     // If we did, it's probably because we talked HTTP 1.1 to a 1.0 proxy;
     // use 1.0 from now on.
 
-char* get_user_agent_string() {
+static void get_user_agent_string() {
+    if (g_user_agent_string[0]) return;
     sprintf(g_user_agent_string, "BOINC client (%s %d.%d.%d)",
         gstate.get_primary_platform(),
         BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, BOINC_RELEASE
     );
-    return (char*)&g_user_agent_string;
+    if (strlen(gstate.client_brand)) {
+        char buf[256];
+        sprintf(buf, " (%s)", gstate.client_brand);
+        strcat(g_user_agent_string, buf);
+    }
 }
 
 size_t libcurl_write(void *ptr, size_t size, size_t nmemb, HTTP_OP* phop) {
diff --git a/client/http_curl.h b/client/http_curl.h
index 68135a7..b89fe01 100644
--- a/client/http_curl.h
+++ b/client/http_curl.h
@@ -206,6 +206,4 @@ public:
 
 };
 
-extern char* get_user_agent_string();
-
 #endif //__HTTP_CURL_
diff --git a/client/sandbox.cpp b/client/sandbox.cpp
index 5a31917..7f11ecb 100644
--- a/client/sandbox.cpp
+++ b/client/sandbox.cpp
@@ -231,10 +231,16 @@ int set_to_project_group(const char*) {
 }
 #endif // ! _WIN32
 
+// delete a file.
+// return success if we deleted it or it didn't exist in the first place
+//
 static int delete_project_owned_file_aux(const char* path) {
 #ifdef _WIN32
     if (DeleteFile(path)) return 0;
     int error = GetLastError();
+    if (error == ERROR_FILE_NOT_FOUND) {
+        return 0;
+    }
     if (error == ERROR_ACCESS_DENIED) {
         SetFileAttributes(path, FILE_ATTRIBUTE_NORMAL);
         if (DeleteFile(path)) return 0;
@@ -242,6 +248,9 @@ static int delete_project_owned_file_aux(const char* path) {
     return ERR_UNLINK;
 #else
     int retval = unlink(path);
+    if (retval == ENOENT) {
+        return 0;
+    }
     if (retval && g_use_sandbox && (errno == EACCES)) {
         // We may not have permission to read subdirectories created by projects
         return remove_project_owned_file_or_dir(path);
@@ -258,9 +267,6 @@ static int delete_project_owned_file_aux(const char* path) {
 int delete_project_owned_file(const char* path, bool retry) {
     int retval = 0;
 
-    if (!boinc_file_or_symlink_exists(path)) {
-        return 0;
-    }
     retval = delete_project_owned_file_aux(path);
     if (retval && retry) {
         double start = dtime();
@@ -271,6 +277,12 @@ int delete_project_owned_file(const char* path, bool retry) {
         } while (dtime() < start + FILE_RETRY_INTERVAL);
     }
     if (retval) {
+        if (log_flags.slot_debug) {
+            msg_printf(0, MSG_INFO,
+                "[slot] failed to remove file %s: %s",
+                path, boincerror(retval)
+            );
+        }
         safe_strcpy(boinc_failed_file, path);
         return ERR_UNLINK;
     }
@@ -306,7 +318,18 @@ int client_clean_out_dir(const char* dirpath, const char* reason) {
     while (1) {
         strcpy(filename, "");
         retval = dir_scan(filename, dirp, sizeof(filename));
-        if (retval) break;
+        if (retval) {
+            if (retval != ERR_NOT_FOUND) {
+                if (log_flags.slot_debug) {
+                    msg_printf(0, MSG_INFO,
+                        "[slot] dir_scan(%s) failed: %s",
+                        dirpath, boincerror(retval)
+                    );
+                }
+                final_retval = retval;
+            }
+            break;
+        }
         sprintf(path, "%s/%s", dirpath,  filename);
         if (is_dir(path)) {
             retval = client_clean_out_dir(path, NULL);
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 2e9a58d..ebb70ae 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -161,11 +161,13 @@ void CStatusBar::OnSize(wxSizeEvent& event) {
 IMPLEMENT_DYNAMIC_CLASS(CAdvancedFrame, CBOINCBaseFrame)
 
 BEGIN_EVENT_TABLE (CAdvancedFrame, CBOINCBaseFrame)
+    EVT_MENU_OPEN(CAdvancedFrame::OnMenuOpening)
     // View
     EVT_MENU_RANGE(ID_ADVNOTICESVIEW, ID_ADVRESOURCEUSAGEVIEW, CAdvancedFrame::OnChangeView)
     EVT_MENU(ID_CHANGEGUI, CAdvancedFrame::OnChangeGUI)
     // Tools
-    EVT_MENU(ID_WIZARDATTACH, CAdvancedFrame::OnWizardAttach)
+    EVT_MENU(ID_WIZARDATTACHPROJECT, CAdvancedFrame::OnWizardAttachProject)
+    EVT_MENU(ID_WIZARDATTACHACCOUNTMANAGER, CAdvancedFrame::OnWizardUpdate)
     EVT_MENU(ID_WIZARDUPDATE, CAdvancedFrame::OnWizardUpdate)
     EVT_MENU(ID_WIZARDDETACH, CAdvancedFrame::OnWizardDetach)
     // Activity
@@ -381,9 +383,10 @@ bool CAdvancedFrame::CreateMenu() {
     );
 
 #ifdef __WXMAC__
+    // wxWidgets actually puts this in the BOINCManager menu
     menuFile->Append(
         wxID_PREFERENCES,
-        _("Preferences…")
+        _("Preferences...")
     );
 #endif
 
@@ -427,12 +430,6 @@ bool CAdvancedFrame::CreateMenu() {
     );
 
     menuView->AppendSeparator();
-    menuView->Append(
-        ID_EVENTLOG, 
-        _("Event Log...\tCtrl+Shift+E"),
-        _("Show diagnostic messages")
-    );
-    menuView->AppendSeparator();
 
     menuView->Append(
         ID_CHANGEGUI,
@@ -450,9 +447,14 @@ bool CAdvancedFrame::CreateMenu() {
 
     if (!is_acct_mgr_detected) {
         menuTools->Append(
-            ID_WIZARDATTACH, 
-            _("&Add project or account manager..."),
-            _("Add a new science project, or use an account manager")
+            ID_WIZARDATTACHPROJECT, 
+            _("&Add project..."),
+            _("Add a project")
+        );
+        menuTools->Append(
+            ID_WIZARDATTACHACCOUNTMANAGER, 
+            _("&Use account manager..."),
+            _("Use an account manager to control this computer.")
         );
     } else {
         strMenuName.Printf(
@@ -469,7 +471,7 @@ bool CAdvancedFrame::CreateMenu() {
             strMenuDescription
         );
         menuTools->Append(
-            ID_WIZARDATTACH, 
+            ID_WIZARDATTACHPROJECT, 
             _("&Add project..."),
             _("Add a project")
         );
@@ -494,6 +496,12 @@ bool CAdvancedFrame::CreateMenu() {
         _("Retry pending transfers"),
         _("Retry deferred file transfers and task requests")
     );
+    menuTools->AppendSeparator();
+    menuTools->Append(
+        ID_EVENTLOG, 
+        _("Event Log...\tCtrl+Shift+E"),
+        _("Show diagnostic messages")
+    );
 
     // Activity menu
     wxMenu *menuActivity = new wxMenu;
@@ -1064,6 +1072,45 @@ int CAdvancedFrame::_GetCurrentViewPage() {
 }
 
 
+void CAdvancedFrame::OnMenuOpening( wxMenuEvent &event) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnMenuOpening - Function Begin"));
+
+    CMainDocument*     pDoc = wxGetApp().GetDocument();
+    wxMenu* menuFile = NULL;
+    wxMenu* menuHelp = NULL;
+    
+    wxASSERT(pDoc);
+    
+    bool isConnected = pDoc->IsConnected();
+    wxMenu* menu = event.GetMenu();
+    
+    menu->FindItem(ID_SELECTCOMPUTER, &menuFile);
+    menu->FindItem(ID_HELPBOINC, &menuHelp);
+    size_t numItems = menu->GetMenuItemCount();
+    for (size_t pos = 0; pos < numItems; ++pos) {
+        wxMenuItem * item = menu->FindItemByPosition(pos);
+        if ((menu == menuFile) || (menu == menuHelp)) {
+            // Always enable all items in File menu or Help menu:
+            // ID_LAUNCHNEWINSTANCE, ID_SELECTCOMPUTER, ID_SHUTDOWNCORECLIENT,
+            // ID_CLOSEWINDOW, wxID_EXIT, ID_HELPBOINC, ID_HELPBOINCMANAGER,
+            // ID_HELPBOINCWEBSITE, wxID_ABOUT
+            item->Enable(true);
+        } else {
+            // Disable other menu items if not connected to client
+            item->Enable(isConnected);
+        }
+    }
+    
+    // wxID_EXIT and wxID_PREFERENCES are not in File menu on some platforms
+    wxMenuItem* exitItem = menu->FindChildItem(wxID_EXIT, NULL);
+    if (exitItem) {
+        exitItem->Enable(true);
+    }
+    
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnMenuOpening - Function End"));
+}
+
+
 void CAdvancedFrame::OnChangeView(wxCommandEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnChangeView - Function Begin"));
 
@@ -1082,8 +1129,8 @@ void CAdvancedFrame::OnChangeGUI(wxCommandEvent& WXUNUSED(event)) {
 }
 
 
-void CAdvancedFrame::OnWizardAttach( wxCommandEvent& WXUNUSED(event) ) {
-    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnWizardAttach - Function Begin"));
+void CAdvancedFrame::OnWizardAttachProject( wxCommandEvent& WXUNUSED(event) ) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnWizardAttachProject - Function Begin"));
 
     CMainDocument* pDoc     = wxGetApp().GetDocument();
 
@@ -1120,7 +1167,7 @@ void CAdvancedFrame::OnWizardAttach( wxCommandEvent& WXUNUSED(event) ) {
         ShowNotCurrentlyConnectedAlert();
     }
 
-    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnWizardAttach - Function End"));
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnWizardAttachProject - Function End"));
 }
 
 
@@ -1316,7 +1363,9 @@ void CAdvancedFrame::OnPreferences(wxCommandEvent& WXUNUSED(event)) {
     wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnPreferences - Function Begin"));
 
     CDlgAdvPreferences dlg(this);
-	dlg.ShowModal();
+    if (dlg.OKToShow()) {
+        dlg.ShowModal();
+    }
 
     wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnPreferences - Function End"));
 }
@@ -1947,7 +1996,7 @@ void CAdvancedFrame::OnFrameRender(wxTimerEvent& WXUNUSED(event)) {
                     UpdateNetworkModeControls(status);
 
                     if (status.disallow_attach) {
-                        pMenuBar->Enable(ID_WIZARDATTACH, false);
+                        pMenuBar->Enable(ID_WIZARDATTACHPROJECT, false);
                     }
                 }
 
diff --git a/clientgui/AdvancedFrame.h b/clientgui/AdvancedFrame.h
index b1bf4d4..a44bce9 100644
--- a/clientgui/AdvancedFrame.h
+++ b/clientgui/AdvancedFrame.h
@@ -62,7 +62,7 @@ public:
     void OnChangeView( wxCommandEvent& event );
     void OnChangeGUI( wxCommandEvent& event );
 
-    void OnWizardAttach( wxCommandEvent& event );
+    void OnWizardAttachProject( wxCommandEvent& event );
     void OnWizardUpdate( wxCommandEvent& event );
     void OnWizardDetach( wxCommandEvent& event );
 
@@ -70,6 +70,7 @@ public:
     void OnGPUSelection( wxCommandEvent& event );
     void OnNetworkSelection( wxCommandEvent& event );
 
+    void OnMenuOpening( wxMenuEvent &event);
     void OnOptions( wxCommandEvent& event );
 	void OnPreferences( wxCommandEvent& event );
     void OnExclusiveApps( wxCommandEvent& event );
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index b37d9d2..5dec982 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -54,244 +54,6 @@
 
 bool s_bSkipExitConfirmation = false;
 
-wxChar* Convert28toISOLangCode[] = 
-{
-    wxT(""),
-    wxT(""),
-    wxT("ab"),
-    wxT("aa"),
-    wxT("af_ZA"),
-    wxT("sq_AL"),
-    wxT("am"),
-    wxT("ar"),
-    wxT("ar_DZ"),
-    wxT("ar_BH"),
-    wxT("ar_EG"),
-    wxT("ar_IQ"),
-    wxT("ar_JO"),
-    wxT("ar_KW"),
-    wxT("ar_LB"),
-    wxT("ar_LY"),
-    wxT("ar_MA"),
-    wxT("ar_OM"),
-    wxT("ar_QA"),
-    wxT("ar_SA"),
-    wxT("ar_SD"),
-    wxT("ar_SY"),
-    wxT("ar_TN"),
-    wxT("ar_AE"),
-    wxT("ar_YE"),
-    wxT("hy"),
-    wxT("as"),
-    wxT("ay"),
-    wxT("az"),
-    wxT("az"),
-    wxT("az"),
-    wxT("ba"),
-    wxT("eu_ES"),
-    wxT("be_BY"),
-    wxT("bn"),
-    wxT("dz"),
-    wxT("bh"),
-    wxT("bi"),
-    wxT("br"),
-    wxT("bg_BG"),
-    wxT("my"),
-    wxT("km"),
-    wxT("ca_ES"),
-    wxT("zh_TW"),
-    wxT("zh_CN"),
-    wxT("zh_TW"),
-    wxT("zh_HK"),
-    wxT("zh_MO"),
-    wxT("zh_SG"),
-    wxT("zh_TW"),
-    wxT("co"),
-    wxT("hr_HR"),
-    wxT("cs_CZ"),
-    wxT("da_DK"),
-    wxT("nl_NL"),
-    wxT("nl_BE"),
-    wxT("en_GB"),
-    wxT("en_GB"),
-    wxT("en_US"),
-    wxT("en_AU"),
-    wxT("en_BZ"),
-    wxT("en_BW"),
-    wxT("en_CA"),
-    wxT("en_CB"),
-    wxT("en_DK"),
-    wxT("en_IE"),
-    wxT("en_JM"),
-    wxT("en_NZ"),
-    wxT("en_PH"),
-    wxT("en_ZA"),
-    wxT("en_TT"),
-    wxT("en_ZW"),
-    wxT("eo"),
-    wxT("et_EE"),
-    wxT("fo_FO"),
-    wxT("fa_IR"),
-    wxT("fj"),
-    wxT("fi_FI"),
-    wxT("fr_FR"),
-    wxT("fr_BE"),
-    wxT("fr_CA"),
-    wxT("fr_LU"),
-    wxT("fr_MC"),
-    wxT("fr_CH"),
-    wxT("fy"),
-    wxT("gl_ES"),
-    wxT("ka_GE"),
-    wxT("de_DE"),
-    wxT("de_AT"),
-    wxT("de_BE"),
-    wxT("de_LI"),
-    wxT("de_LU"),
-    wxT("de_CH"),
-    wxT("el_GR"),
-    wxT("kl_GL"),
-    wxT("gn"),
-    wxT("gu"),
-    wxT("ha"),
-    wxT("he_IL"),
-    wxT("hi_IN"),
-    wxT("hu_HU"),
-    wxT("is_IS"),
-    wxT("id_ID"),
-    wxT("ia"),
-    wxT("ie"),
-    wxT("iu"),
-    wxT("ik"),
-    wxT("ga_IE"),
-    wxT("it_IT"),
-    wxT("it_CH"),
-    wxT("ja_JP"),
-    wxT("jw"),
-    wxT("kn"),
-    wxT("ks"),
-    wxT("ks_IN"),
-    wxT("kk"),
-    wxT("kw_GB"),
-    wxT("rw"),
-    wxT("ky"),
-    wxT("rn"),
-    wxT(""),
-    wxT("ko_KR"),
-    wxT("ku_TR"),
-    wxT("lo"),
-    wxT("la"),
-    wxT("lv_LV"),
-    wxT("ln"),
-    wxT("lt_LT"),
-    wxT("mk_MK"),
-    wxT("mg"),
-    wxT("ms_MY"),
-    wxT("ml"),
-    wxT("ms_BN"),
-    wxT("ms_MY"),
-    wxT("mt_MT"),
-    wxT(""),
-    wxT("mi"),
-    wxT("mr_IN"),
-    wxT("mo"),
-    wxT("mn"),
-    wxT("na"),
-    wxT("ne_NP"),
-    wxT("ne_IN"),
-    wxT("nb_NO"),
-    wxT("nn_NO"),
-    wxT("oc"),
-    wxT("or"),
-    wxT("om"),
-    wxT("ps"),
-    wxT("pl_PL"),
-    wxT("pt_PT"),
-    wxT("pt_BR"),
-    wxT("pa"),
-    wxT("qu"),
-    wxT("rm"),
-    wxT("ro_RO"),
-    wxT("ru_RU"),
-    wxT("ru_UA"),
-    wxT("se_NO"),
-    wxT("sm"),
-    wxT("sg"),
-    wxT("sa"),
-    wxT("gd"),
-    wxT("sr_RS"),
-    wxT("sr_RS"),
-    wxT("sr_RS at latin"),
-    wxT("sr_YU"),
-    wxT("sr_YU at latin"),
-    wxT("sh"),
-    wxT("st"),
-    wxT("tn"),
-    wxT("sn"),
-    wxT("sd"),
-    wxT("si"),
-    wxT("ss"),
-    wxT("sk_SK"),
-    wxT("sl_SI"),
-    wxT("so"),
-    wxT("es_ES"),
-    wxT("es_AR"),
-    wxT("es_BO"),
-    wxT("es_CL"),
-    wxT("es_CO"),
-    wxT("es_CR"),
-    wxT("es_DO"),
-    wxT("es_EC"),
-    wxT("es_SV"),
-    wxT("es_GT"),
-    wxT("es_HN"),
-    wxT("es_MX"),
-    wxT("es_ES"),
-    wxT("es_NI"),
-    wxT("es_PA"),
-    wxT("es_PY"),
-    wxT("es_PE"),
-    wxT("es_PR"),
-    wxT("es_UY"),
-    wxT("es_US"),
-    wxT("es_VE"),
-    wxT("su"),
-    wxT("sw_KE"),
-    wxT("sv_SE"),
-    wxT("sv_FI"),
-    wxT("tl_PH"),
-    wxT("tg"),
-    wxT("ta"),
-    wxT("tt"),
-    wxT("te"),
-    wxT("th_TH"),
-    wxT("bo"),
-    wxT("ti"),
-    wxT("to"),
-    wxT("ts"),
-    wxT("tr_TR"),
-    wxT("tk"),
-    wxT("tw"),
-    wxT("ug"),
-    wxT("uk_UA"),
-    wxT("ur"),
-    wxT("ur_IN"),
-    wxT("ur_PK"),
-    wxT("uz"),
-    wxT("uz"),
-    wxT("uz"),
-    wxT("ca_ES at valencia"),
-    wxT("vi_VN"),
-    wxT("vo"),
-    wxT("cy"),
-    wxT("wo"),
-    wxT("xh"),
-    wxT("yi"),
-    wxT("yo"),
-    wxT("za"),
-    wxT("zu")
-};
-
 
 #ifdef __WXMAC__
 
@@ -396,7 +158,6 @@ bool CBOINCGUIApp::OnInit() {
     // Initialize local variables
     int      iErrorCode = 0;
     int      iDesiredLanguageCode = 0;
-    int      iOldLanguageCode = 0;
     bool     bOpenEventLog = false;
     wxString strDesiredSkinName = wxEmptyString;
     wxString strDialogMessage = wxEmptyString;
@@ -457,7 +218,6 @@ bool CBOINCGUIApp::OnInit() {
     m_pConfig->Read(wxT("AutomaticallyShutdownClient"), &m_iShutdownCoreClient, 0L);
     m_pConfig->Read(wxT("DisplayShutdownClientDialog"), &m_iDisplayExitDialog, 1L);
     m_pConfig->Read(wxT("DisableAutoStart"), &m_iBOINCMGRDisableAutoStart, 0L);
-    m_pConfig->Read(wxT("Language"), &iOldLanguageCode, 0);
     m_pConfig->Read(wxT("LanguageISO"), &m_strISOLanguageCode, wxT(""));
     m_pConfig->Read(wxT("GUISelection"), &m_iGUISelected, BOINC_SIMPLEGUI);
     m_pConfig->Read(wxT("EventLogOpen"), &bOpenEventLog);
@@ -525,12 +285,6 @@ bool CBOINCGUIApp::OnInit() {
     //
     if (m_strISOLanguageCode.IsEmpty()) {
         iDesiredLanguageCode = wxLANGUAGE_DEFAULT;
-        if (iOldLanguageCode) {
-            strOldLanguageCode = Convert28toISOLangCode[iOldLanguageCode];
-            if (!strOldLanguageCode.IsEmpty()) {
-                iDesiredLanguageCode = wxLocale::FindLanguageInfo(strOldLanguageCode)->Language;
-            }
-        }
         m_pLocale->Init(iDesiredLanguageCode);
         m_strISOLanguageCode = m_pLocale->GetCanonicalName();
     } else {
diff --git a/clientgui/BOINCListCtrl.cpp b/clientgui/BOINCListCtrl.cpp
index a7ca9f1..f38277e 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();
@@ -344,6 +345,24 @@ void CBOINCListCtrl::SetListColumnOrder(wxArrayString& orderArray) {
         }
     }
     
+    // Prevent a crash bug if we just changed to a new locale.
+    //
+    // If a column has the same name in both the old and new locale, we guard against
+    // changing the sort column to that column.
+    //
+    // CBOINCListCtrl::OnRestoreState() may have incorrectly added the column names in
+    // the new locale as "new" columns, so check against both shownColCount and stdCount.
+    int limit = wxMin(shownColCount, stdCount);
+    if (columnIndex < limit) {
+        SetStandardColumnOrder();
+        for (columnID=0; columnID<limit; ++columnID) {
+            aOrder[columnID] = columnID;
+            pView->AppendColumn(columnID);
+            pView->m_iColumnIndexToColumnID.Add(columnID);
+            pView->m_iColumnIDToColumnIndex[columnID] = columnID;
+        }
+    }
+    
     // If sort column is now hidden, set the new first column as sort column
     if (pView->m_iSortColumnID >= 0) {
         sortColumnIndex = pView->m_iColumnIDToColumnIndex[pView->m_iSortColumnID];
@@ -358,7 +377,10 @@ void CBOINCListCtrl::SetListColumnOrder(wxArrayString& orderArray) {
     }
     
 #ifdef wxHAS_LISTCTRL_COLUMN_ORDER
-    SetColumnsOrder(aOrder);
+    colCount = GetColumnCount();
+    if ((shownColCount > 0) && (shownColCount <= stdCount) && (colCount == shownColCount)) {
+        SetColumnsOrder(aOrder);
+    }
 #endif
 }
 
@@ -385,7 +407,9 @@ void CBOINCListCtrl::SetStandardColumnOrder() {
         aOrder[i] = i;
     }
 #ifdef wxHAS_LISTCTRL_COLUMN_ORDER
-    SetColumnsOrder(aOrder);
+    if (colCount) {
+        SetColumnsOrder(aOrder);
+    }
 #endif
 }
 
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 3f226af..66e6029 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -569,6 +569,7 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
     wxFont         font = wxNullFont;
     size_t         loc = 0;
     bool           is_dialog_detected = false;
+    bool           enableSnoozeItems = false;
 
     wxASSERT(pDoc);
     wxASSERT(wxDynamicCast(pDoc, CMainDocument));
@@ -583,6 +584,8 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
     if (wxGetApp().IsModalDialogDisplayed()) {
         is_dialog_detected = true;
     }
+    
+    enableSnoozeItems = (!is_dialog_detected) && pDoc->IsConnected();
         
     for (loc = 0; loc < pMenu->GetMenuItemCount(); loc++) {
         pMenuItem = pMenu->FindItemByPosition(loc);
@@ -625,25 +628,18 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
         case RUN_MODE_NEVER:
             m_SnoozeMenuItem->SetItemLabel(_("Resume"));
             m_SnoozeMenuItem->Check(false);
-            if (!is_dialog_detected) {
-                m_SnoozeMenuItem->Enable(true);
-            }
+            m_SnoozeMenuItem->Enable(enableSnoozeItems);
             break;
         default:
             m_SnoozeMenuItem->SetItemLabel(_("Snooze"));
             m_SnoozeMenuItem->Check(true);
-            if (!is_dialog_detected) {
-                m_SnoozeMenuItem->Enable(true);
-            }
         }
         break;
     default:
         m_SnoozeMenuItem->SetItemLabel(_("Snooze"));
         m_SnoozeMenuItem->Check(false);
-        if (!is_dialog_detected) {
-            m_SnoozeMenuItem->Enable(true);
-        }
     }
+    m_SnoozeMenuItem->Enable(enableSnoozeItems);
     
     if (pDoc->state.have_gpu()) {
         switch (status.gpu_mode) {
@@ -652,30 +648,22 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
             case RUN_MODE_NEVER:
                 m_SnoozeGPUMenuItem->SetItemLabel(_("Resume GPU"));
                 m_SnoozeGPUMenuItem->Check(false);
-                if (!is_dialog_detected) {
-                    m_SnoozeGPUMenuItem->Enable(true);
-                }
                 break;
             default:
                 m_SnoozeGPUMenuItem->SetItemLabel(_("Snooze GPU"));
                 m_SnoozeGPUMenuItem->Check(true);
-                if (!is_dialog_detected) {
-                    m_SnoozeGPUMenuItem->Enable(true);
-                }
             }
             break;
         default:
             m_SnoozeGPUMenuItem->SetItemLabel(_("Snooze GPU"));
             m_SnoozeGPUMenuItem->Check(false);
-            if (!is_dialog_detected) {
-                m_SnoozeGPUMenuItem->Enable(true);
-            }
             break;
         }
         if (status.task_mode == RUN_MODE_NEVER) {
             m_SnoozeGPUMenuItem->Check(false);
             m_SnoozeGPUMenuItem->Enable(false);
         }
+        m_SnoozeGPUMenuItem->Enable(enableSnoozeItems);
     }
 }
 
diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp
index 8e4d0d5..a573dfd 100644
--- a/clientgui/DlgAbout.cpp
+++ b/clientgui/DlgAbout.cpp
@@ -200,17 +200,13 @@ void CDlgAbout::CreateControls() {
     itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0);
 
     wxStaticText* itemStaticText15 = new wxStaticText;
-    itemStaticText15->Create( itemDialog1, wxID_STATIC, _("Visit "), wxDefaultPosition, wxDefaultSize, 0 );
+    itemStaticText15->Create( itemDialog1, wxID_STATIC, _("For more information, visit "), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer3->Add(itemStaticText15, 0, wxALIGN_CENTER|wxALL, 5);
 
     m_AboutBOINCURLCtrl = new wxHyperlinkCtrl;
     m_AboutBOINCURLCtrl->Create( itemDialog1, ID_ABOUTBOINCLINK, wxT("http://boinc.berkeley.edu/"), wxT("http://boinc.berkeley.edu/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxHL_ALIGN_CENTRE | wxHL_CONTEXTMENU );
     itemBoxSizer3->Add(m_AboutBOINCURLCtrl, 0, wxALIGN_CENTER|wxALL, 0);
 
-    wxStaticText* itemStaticText16 = new wxStaticText;
-    itemStaticText16->Create( itemDialog1, wxID_STATIC, _("for more information."), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer3->Add(itemStaticText16, 0, wxALIGN_CENTER|wxALL, 5);
-
     wxStaticLine* itemStaticLine15 = new wxStaticLine;
     itemStaticLine15->Create( itemDialog1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
     itemBoxSizer2->Add(itemStaticLine15, 0, wxGROW|wxALL, 5);
diff --git a/clientgui/DlgAdvPreferences.cpp b/clientgui/DlgAdvPreferences.cpp
index 1e25c07..aa8c10b 100644
--- a/clientgui/DlgAdvPreferences.cpp
+++ b/clientgui/DlgAdvPreferences.cpp
@@ -76,8 +76,10 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
     m_Notebook->SetPageImage(3,iImageIndex);
 
     //setting warning bitmap
-    m_bmpWarning->SetBitmap(GetScaledBitmapFromXPMData(warning_xpm));
-
+    if (m_bmpWarning) {
+        m_bmpWarning->SetBitmap(GetScaledBitmapFromXPMData(warning_xpm));
+    }
+    
     wxCheckBox* proc_cb[] = {m_chkProcSunday,m_chkProcMonday,m_chkProcTuesday,m_chkProcWednesday,m_chkProcThursday,m_chkProcFriday,m_chkProcSaturday};
     wxTextCtrl* proc_tstarts[] = {m_txtProcSundayStart,m_txtProcMondayStart,m_txtProcTuesdayStart,m_txtProcWednesdayStart,m_txtProcThursdayStart,m_txtProcFridayStart,m_txtProcSaturdayStart};
     wxTextCtrl* proc_tstops[] = {m_txtProcSundayStop,m_txtProcMondayStop,m_txtProcTuesdayStop,m_txtProcWednesdayStop,m_txtProcThursdayStop,m_txtProcFridayStop,m_txtProcSaturdayStop};
@@ -99,6 +101,9 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
     SetValidators();
     //read in settings and initialize controls
     ReadPreferenceSettings();
+
+    if (! m_bOKToShow) return;
+
     // Get default preference values
     defaultPrefs.enabled_defaults();
     //
@@ -130,7 +135,9 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
 
 /* destructor */
 CDlgAdvPreferences::~CDlgAdvPreferences() {
-    SaveState();
+    if (m_bOKToShow) {
+        SaveState();
+    }
     delete m_vTimeValidator;
 }
 
@@ -286,8 +293,14 @@ void CDlgAdvPreferences::ReadPreferenceSettings() {
     if (retval == ERR_NOT_FOUND) {
         // Older clients don't support get_global_prefs_working_struct RPC
         prefs = pDoc->state.global_prefs;
-        pDoc->rpc.get_global_prefs_override_struct(prefs, mask);
+        retval = pDoc->rpc.get_global_prefs_override_struct(prefs, mask);
+    }
+    if (retval) {
+        m_bOKToShow = false;
+        return;
     }
+    
+    m_bOKToShow = true;
 
     // ######### proc usage page
     // max cpus
@@ -396,7 +409,7 @@ void CDlgAdvPreferences::ReadPreferenceSettings() {
     //special day times
     for(int i=0; i< 7;i++) {
         TIME_SPAN& cpu = prefs.cpu_times.week.days[i];
-        if(cpu.present) {
+        if(cpu.present && (cpu.start_hour != cpu.end_hour)) {
             procDayChks[i]->SetValue(true);
             procDayStartTxts[i]->ChangeValue(DoubleToTimeString(cpu.start_hour));
             procDayStopTxts[i]->ChangeValue(DoubleToTimeString(cpu.end_hour));
@@ -413,7 +426,7 @@ void CDlgAdvPreferences::ReadPreferenceSettings() {
     //special net times
     for(int i=0; i< 7;i++) {
         TIME_SPAN& net = prefs.net_times.week.days[i];
-        if(net.present) {
+        if(net.present && (net.start_hour != net.end_hour)) {
             netDayChks[i]->SetValue(true);
             netDayStartTxts[i]->ChangeValue(DoubleToTimeString(net.start_hour));
             netDayStopTxts[i]->ChangeValue(DoubleToTimeString(net.end_hour));
@@ -668,9 +681,11 @@ void CDlgAdvPreferences::UpdateControlStates() {
 bool CDlgAdvPreferences::ValidateInput() {
     wxString invMsgFloat = _("Invalid number");
     wxString invMsgTime = _("Invalid time, value must be between 0:00 and 24:00, format is HH:MM");
+    wxString invMsgTimeSpan = _("Start time must be different from end time");
     wxString invMsgLimit10 = _("Number must be between 0 and 10");
     wxString invMsgLimit100 = _("Number must be between 0 and 100");
     wxString buffer;
+    double startTime, endTime;
 
     // ######### proc usage page
     buffer = m_txtProcUseProcessors->GetValue();
@@ -819,6 +834,12 @@ bool CDlgAdvPreferences::ValidateInput() {
             ShowErrorMessage(invMsgTime,m_txtProcEveryDayStop);
             return false;
         }
+        startTime = TimeStringToDouble(m_txtProcEveryDayStart->GetValue());
+        endTime = TimeStringToDouble(m_txtProcEveryDayStop->GetValue());
+        if (startTime == endTime) {
+            ShowErrorMessage(invMsgTimeSpan,m_txtProcEveryDayStop);
+            return false;
+        }
     }
     
     //all text ctrls in proc special time textBox
@@ -834,6 +855,12 @@ bool CDlgAdvPreferences::ValidateInput() {
                 ShowErrorMessage(invMsgTime,procDayStopTxts[i]);
                 return false;
             }
+            startTime = TimeStringToDouble(procDayStartTxts[i]->GetValue());
+            endTime = TimeStringToDouble(procDayStopTxts[i]->GetValue());
+            if (startTime == endTime) {
+                ShowErrorMessage(invMsgTimeSpan,procDayStopTxts[i]);
+                return false;
+            }
         }
     }
 
@@ -848,6 +875,12 @@ bool CDlgAdvPreferences::ValidateInput() {
             ShowErrorMessage(invMsgTime,m_txtNetEveryDayStop);
             return false;
         }
+        startTime = TimeStringToDouble(m_txtNetEveryDayStart->GetValue());
+        endTime = TimeStringToDouble(m_txtNetEveryDayStop->GetValue());
+        if (startTime == endTime) {
+            ShowErrorMessage(invMsgTimeSpan,m_txtNetEveryDayStop);
+            return false;
+        }
     }
     
     //all text ctrls in net special time textBox
@@ -863,6 +896,12 @@ bool CDlgAdvPreferences::ValidateInput() {
                 ShowErrorMessage(invMsgTime,netDayStopTxts[i]);
                 return false;
             }
+            startTime = TimeStringToDouble(netDayStartTxts[i]->GetValue());
+            endTime = TimeStringToDouble(netDayStopTxts[i]->GetValue());
+            if (startTime == endTime) {
+                ShowErrorMessage(invMsgTimeSpan,netDayStopTxts[i]);
+                return false;
+            }
         }
     }
     return true;
diff --git a/clientgui/DlgAdvPreferences.h b/clientgui/DlgAdvPreferences.h
index 43c2d81..ffa6c87 100644
--- a/clientgui/DlgAdvPreferences.h
+++ b/clientgui/DlgAdvPreferences.h
@@ -58,6 +58,7 @@ public:
 	void OnHelp(wxCommandEvent& event);
 	void OnClear(wxCommandEvent& event);
     void DisplayValue(double value, wxTextCtrl* textCtrl, wxCheckBox* checkBox=NULL);
+    bool OKToShow() { return m_bOKToShow; }
 private:
     GLOBAL_PREFS      prefs;
     GLOBAL_PREFS_MASK mask;
@@ -72,6 +73,7 @@ private:
     wxCheckBox* netDayChks[7];
     wxTextCtrl* netDayStartTxts[7];
     wxTextCtrl* netDayStopTxts[7];
+    bool m_bOKToShow;
 };
 
 #endif // _DLGADVPREFERENCES_H_
diff --git a/clientgui/DlgAdvPreferencesBase.cpp b/clientgui/DlgAdvPreferencesBase.cpp
index 33afc86..66a9ac6 100644
--- a/clientgui/DlgAdvPreferencesBase.cpp
+++ b/clientgui/DlgAdvPreferencesBase.cpp
@@ -59,76 +59,81 @@ CDlgAdvPreferencesBase::CDlgAdvPreferencesBase( wxWindow* parent, int id, wxStri
     this->SetTitle(strCaption);
 
     wxBoxSizer* dialogSizer = new wxBoxSizer( wxVERTICAL );
-    wxStaticBox* topControlsStaticBox = new wxStaticBox( this, -1, wxEmptyString );
 
-    wxStaticBoxSizer* topControlsSizer = new wxStaticBoxSizer( topControlsStaticBox, wxHORIZONTAL );
-
-    m_bmpWarning = new wxStaticBitmap( topControlsStaticBox, ID_DEFAULT, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bmpWarning->SetMinSize( wxSize( 48,48 ) );
-
-    topControlsSizer->Add( m_bmpWarning, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
-
-    wxBoxSizer* legendSizer = new wxBoxSizer( wxVERTICAL );
 
     bool usingLocalPrefs = doesLocalPrefsFileExist();
-    if (usingLocalPrefs) {
-        legendSizer->Add(
-            new wxStaticText( topControlsStaticBox, ID_DEFAULT,
-                        _("Using local preferences.\n"
-                        "Click \"Use web prefs\" to use web-based preferences from"
-                        ), wxDefaultPosition, wxDefaultSize, 0 ),
-            0, wxALL, 1
-        );
+    if (web_prefs_url->IsEmpty()) {
+        m_bmpWarning = NULL;
     } else {
+        wxStaticBox* topControlsStaticBox = new wxStaticBox( this, -1, wxEmptyString );
+
+        wxStaticBoxSizer* topControlsSizer = new wxStaticBoxSizer( topControlsStaticBox, wxHORIZONTAL );
+
+        m_bmpWarning = new wxStaticBitmap( topControlsStaticBox, ID_DEFAULT, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+        m_bmpWarning->SetMinSize( wxSize( 48,48 ) );
+
+        topControlsSizer->Add( m_bmpWarning, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
+
+        wxBoxSizer* legendSizer = new wxBoxSizer( wxVERTICAL );
+
+        if (usingLocalPrefs) {
+            legendSizer->Add(
+                new wxStaticText( topControlsStaticBox, ID_DEFAULT,
+                            _("Using local preferences.\n"
+                            "Click \"Use web prefs\" to use web-based preferences from"
+                            ), wxDefaultPosition, wxDefaultSize, 0 ),
+                0, wxALL, 1
+            );
+        } else {
+            legendSizer->Add(
+                new wxStaticText( topControlsStaticBox, ID_DEFAULT,
+                            _("Using web-based preferences from"),
+                            wxDefaultPosition, wxDefaultSize, 0 ),
+                0, wxALL, 1
+            );
+        }
+        
         legendSizer->Add(
-            new wxStaticText( topControlsStaticBox, ID_DEFAULT,
-                        _("Using web-based preferences from"),
-                        wxDefaultPosition, wxDefaultSize, 0 ),
-            0, wxALL, 1
+            new wxHyperlinkCtrl(
+                topControlsStaticBox, wxID_ANY, *web_prefs_url, *web_prefs_url,
+                wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE
+            ),
+            0, wxLEFT, 5
         );
-    }
-    
-     legendSizer->Add(
-        new wxHyperlinkCtrl(
-            topControlsStaticBox, wxID_ANY, *web_prefs_url, *web_prefs_url,
-            wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE
-        ),
-        0, wxLEFT, 5
-    );
-    
-    if (!usingLocalPrefs) {
-        legendSizer->Add(
-            new wxStaticText( topControlsStaticBox, ID_DEFAULT,
-                 _("Set values and click OK to use local preferences instead."),
-                 wxDefaultPosition, wxDefaultSize, 0 ),
-            0, wxALL, 1
-        );
-    }
-  
-    topControlsSizer->Add( legendSizer, 1, wxALL, 1 );
+        
+        if (!usingLocalPrefs) {
+            legendSizer->Add(
+                new wxStaticText( topControlsStaticBox, ID_DEFAULT,
+                     _("Set values and click OK to use local preferences instead."),
+                     wxDefaultPosition, wxDefaultSize, 0 ),
+                0, wxALL, 1
+            );
+        }
+      
+        topControlsSizer->Add( legendSizer, 1, wxALL, 1 );
 
 #if 0
-    wxStaticText* staticText321 = new wxStaticText( topControlsStaticBox, ID_DEFAULT, _("This dialog controls preferences for this computer only.\nClick OK to set preferences.\nClick Clear to restore web-based settings."), wxDefaultPosition, wxDefaultSize, 0 );
-    topControlsSizer->Add( staticText321, 1, wxALL, 1 );
+        wxStaticText* staticText321 = new wxStaticText( topControlsStaticBox, ID_DEFAULT, _("This dialog controls preferences for this computer only.\nClick OK to set preferences.\nClick Clear to restore web-based settings."), wxDefaultPosition, wxDefaultSize, 0 );
+        topControlsSizer->Add( staticText321, 1, wxALL, 1 );
 
-    m_btnClear = new wxButton( topControlsStaticBox, ID_BTN_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btnClear->SetToolTip( _("Clear all local preferences and close the dialog.") );
+        m_btnClear = new wxButton( topControlsStaticBox, ID_BTN_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
+        m_btnClear->SetToolTip( _("Clear all local preferences and close the dialog.") );
 #endif
 
-    m_btnClear = new wxButton( topControlsStaticBox, ID_BTN_CLEAR, _("Use web prefs"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btnClear->SetToolTip( _("Restore web-based preferences and close the dialog.") );
-    if (!usingLocalPrefs) {
-        m_btnClear->Hide();
-    }
-    
-    topControlsSizer->Add( m_btnClear, 0, wxALIGN_BOTTOM|wxALL, 4 );
+        m_btnClear = new wxButton( topControlsStaticBox, ID_BTN_CLEAR, _("Use web prefs"), wxDefaultPosition, wxDefaultSize, 0 );
+        m_btnClear->SetToolTip( _("Restore web-based preferences and close the dialog.") );
+        if (!usingLocalPrefs) {
+            m_btnClear->Hide();
+        }
+        
+        topControlsSizer->Add( m_btnClear, 0, wxALIGN_BOTTOM|wxALL, 4 );
 
 #ifdef __WXMAC__
-    dialogSizer->Add( topControlsSizer, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 10 );
+        dialogSizer->Add( topControlsSizer, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 10 );
 #else
-    dialogSizer->Add( topControlsSizer, 0, wxALL|wxEXPAND, 5 );
+        dialogSizer->Add( topControlsSizer, 0, wxALL|wxEXPAND, 5 );
 #endif
-
+    }
     m_panelControls = new wxPanel( this, ID_DEFAULT, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
     m_panelControls->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY );
 
@@ -303,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
         );
@@ -311,14 +317,18 @@ 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);
 
     // max CPU load
     wxString MaxLoadCheckBoxText = wxEmptyString;
-    MaxLoadCheckBoxText.Printf(_("Suspend when non-%s CPU usage is above"), pSkinAdvanced->GetApplicationShortName().c_str());
+    MaxLoadCheckBoxText.Printf(_("Suspend when non-BOINC CPU usage is above"));
 
     wxString MaxLoadTT(_("Suspend computing when your computer is busy running other programs."));
     m_chkMaxLoad = new wxCheckBox(
@@ -341,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);
 
@@ -349,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(
@@ -357,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);
@@ -365,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);
 
@@ -373,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);
 
@@ -471,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);
 
@@ -967,10 +1018,14 @@ bool CDlgAdvPreferencesBase::doesLocalPrefsFileExist() {
     web_prefs.init();
     
     retval = pDoc->rpc.get_global_prefs_file(s);
-    mf.init_buf_read(s.c_str());
-    XML_PARSER xp(&mf);
-    web_prefs.parse(xp, "", found_venue, mask);
-    web_prefs_url = new wxString(web_prefs.source_project);
+    if (retval) {
+        web_prefs_url = new wxString(wxEmptyString);
+    } else {
+        mf.init_buf_read(s.c_str());
+        XML_PARSER xp(&mf);
+        web_prefs.parse(xp, "", found_venue, mask);
+        web_prefs_url = new wxString(web_prefs.source_project);
+    }
     
     return local_prefs_found;
 }
diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp
index 18fa8d2..a186bc0 100644
--- a/clientgui/DlgEventLog.cpp
+++ b/clientgui/DlgEventLog.cpp
@@ -281,11 +281,6 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
 
 void CDlgEventLog::CreateControls()
 {
-    CSkinAdvanced*     pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
-
-    wxASSERT(pSkinAdvanced);
-    wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
-
     wxFlexGridSizer* itemFlexGridSizer2 = new wxFlexGridSizer(2, 1, 0, 0);
     itemFlexGridSizer2->AddGrowableRow(0);
     itemFlexGridSizer2->AddGrowableCol(0);
diff --git a/clientgui/Events.h b/clientgui/Events.h
index dca4dcd..760b3e7 100644
--- a/clientgui/Events.h
+++ b/clientgui/Events.h
@@ -28,9 +28,10 @@
 #define ID_DOCUMENTPOLLTIMER                    6105
 #define ID_ALERTPOLLTIMER                       6106
 #define ID_REFRESHSTATETIMER                    6107
-#define ID_WIZARDATTACH                         6108
-#define ID_WIZARDUPDATE                         6109
-#define ID_WIZARDDETACH                         6110
+#define ID_WIZARDATTACHPROJECT                  6108
+#define ID_WIZARDATTACHACCOUNTMANAGER           6109
+#define ID_WIZARDUPDATE                         6110
+#define ID_WIZARDDETACH                         6111
 
 
 //
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index fbf882d..77357b7 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -2566,7 +2566,7 @@ wxString result_description(RESULT* result, bool show_resources) {
             strBuffer += _("Aborted: not started by deadline");
             break;
         case EXIT_DISK_LIMIT_EXCEEDED:
-            strBuffer += _("Aborted: disk limit exceeded");
+            strBuffer += _("Aborted: task disk limit exceeded");
             break;
         case EXIT_TIME_LIMIT_EXCEEDED:
             strBuffer += _("Aborted: run time limit exceeded");
diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am
index 79408c6..10802c4 100644
--- a/clientgui/Makefile.am
+++ b/clientgui/Makefile.am
@@ -93,7 +93,6 @@ boincmgr_SOURCES = \
     ViewStatistics.cpp \
     ViewTransfers.cpp \
     ViewWork.cpp \
-    WelcomePage.cpp \
     WizardAttach.cpp \
     wizardex.cpp
 
diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp
index 66d3dc4..3a9a027 100644
--- a/clientgui/SkinManager.cpp
+++ b/clientgui/SkinManager.cpp
@@ -94,6 +94,9 @@ void CSkinImage::Clear() {
     m_strDesiredBackgroundColor.Clear();
     m_bmpBitmap = wxNullBitmap;
     m_colBackgroundColor = wxNullColour;
+    m_iAnchorHorizontal = -1;
+    m_iAnchorVertical = -1;
+    
 }
 
 
@@ -116,6 +119,18 @@ int CSkinImage::Parse(MIOFILE& in) {
                 m_strDesiredBackgroundColor = wxString(strBuffer.c_str(), wxConvUTF8);
             }
             continue;
+        } else if (match_tag(buf, "<anchor_horizontal_left>")) {
+            m_iAnchorHorizontal = BKGD_ANCHOR_HORIZ_LEFT;
+        } else if (match_tag(buf, "<anchor_horizontal_center>")) {
+            m_iAnchorHorizontal = BKGD_ANCHOR_HORIZ_CENTER;
+        } else if (match_tag(buf, "<anchor_horizontal_right>")) {
+            m_iAnchorHorizontal = BKGD_ANCHOR_HORIZ_RIGHT;
+        } else if (match_tag(buf, "<anchor_vertical_top>")) {
+            m_iAnchorVertical = BKGD_ANCHOR_VERT_TOP;;
+        } else if (match_tag(buf, "<anchor_vertical_center>")) {
+            m_iAnchorVertical = BKGD_ANCHOR_VERT_CENTER;;
+        } else if (match_tag(buf, "<anchor_vertical_bottom>")) {
+            m_iAnchorVertical = BKGD_ANCHOR_VERT_BOTTOM;;
         }
     }
 
@@ -142,10 +157,21 @@ bool CSkinImage::SetDefaults(wxString strComponentName, const char** ppDefaultBi
 }
 
 
-bool CSkinImage::SetDefaults(wxString strComponentName, const char** ppDefaultBitmap, wxString strBackgroundColor) {
+bool CSkinImage::SetDefaults(wxString strComponentName,
+                                const char** ppDefaultBitmap,
+                                wxString strBackgroundColor,
+                                int horizontalAnchor,
+                                int verticalAnchor
+                            ) {
     m_strComponentName = strComponentName;
     m_ppDefaultBitmap = ppDefaultBitmap;
     m_strDefaultBackgroundColor = strBackgroundColor;
+    if (m_iAnchorHorizontal < 0) {
+        m_iAnchorHorizontal = horizontalAnchor;
+    }
+    if (m_iAnchorVertical < 0) {
+        m_iAnchorVertical = verticalAnchor;
+    }
     return true;
 }
 
@@ -407,10 +433,12 @@ int CSkinSimple::Parse(MIOFILE& in) {
 
 bool CSkinSimple::InitializeDelayedValidation() {
     m_BackgroundImage.SetDefaults(
-        wxT("background"), (const char**)background_image_xpm, wxT("211:211:211")
+        wxT("background"), (const char**)background_image_xpm,
+        wxT("211:211:211"), BKGD_ANCHOR_HORIZ_LEFT, BKGD_ANCHOR_VERT_TOP
     );
     m_DialogBackgroundImage.SetDefaults(
-        wxT("dialog background"), (const char**)dialog_background_image_xpm, wxT("255:255:255")
+        wxT("dialog background"), (const char**)dialog_background_image_xpm,
+        wxT("255:255:255"), BKGD_ANCHOR_HORIZ_CENTER, BKGD_ANCHOR_VERT_CENTER
     );
     m_ProjectImage.SetDefaults(
         wxT("project"), (const char**)project_image_xpm
diff --git a/clientgui/SkinManager.h b/clientgui/SkinManager.h
index 5c73ee2..b2ac54e 100644
--- a/clientgui/SkinManager.h
+++ b/clientgui/SkinManager.h
@@ -24,6 +24,18 @@
 
 #include "miofile.h"
 
+enum {
+    BKGD_ANCHOR_HORIZ_LEFT,
+    BKGD_ANCHOR_HORIZ_CENTER,
+    BKGD_ANCHOR_HORIZ_RIGHT
+};
+
+enum {
+    BKGD_ANCHOR_VERT_TOP,
+    BKGD_ANCHOR_VERT_CENTER,
+    BKGD_ANCHOR_VERT_BOTTOM
+};
+
 class CSkinItem : public wxObject
 {
     DECLARE_DYNAMIC_CLASS( CSkinItem )
@@ -49,6 +61,8 @@ public:
 
     wxBitmap* GetBitmap();
     wxColour* GetBackgroundColor();
+    int  GetHorizontalAnchor() { return m_iAnchorHorizontal; }
+    int  GetVerticalAnchor() { return m_iAnchorVertical; }
 
     bool SetDefaults(
         wxString strComponentName, 
@@ -58,7 +72,9 @@ public:
     bool SetDefaults(
         wxString strComponentName,
         const char** ppDefaultImage,
-        wxString strBackgroundColor
+        wxString strBackgroundColor,
+        int horizontalAnchor = BKGD_ANCHOR_HORIZ_LEFT,
+        int verticalAnchor = BKGD_ANCHOR_VERT_TOP
     );
 
     bool Validate();
@@ -71,6 +87,9 @@ private:
     wxString     m_strDefaultBackgroundColor;
     wxBitmap     m_bmpBitmap;
     wxColour     m_colBackgroundColor;
+    // Anchors are used only by m_BackgroundImage and m_DialogBackgroundImage
+    int          m_iAnchorHorizontal;
+    int          m_iAnchorVertical;
 };
 
 
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index f6080e9..2d3569a 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -250,11 +250,11 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
     m_aStdColNameOrder->Insert(_("Resource share"), COLUMN_RESOURCESHARE);
     m_aStdColNameOrder->Insert(_("Status"), COLUMN_STATUS);
 
-    // m_aStdColNameOrder is an array of the width for each column.
+    // m_iStdColWidthOrder is an array of the width for each column.
     // 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 34de432..7373c9e 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -214,11 +214,11 @@ CViewTransfers::CViewTransfers(wxNotebook* pNotebook) :
     m_aStdColNameOrder->Insert(_("Speed"), COLUMN_SPEED);
     m_aStdColNameOrder->Insert(_("Status"), COLUMN_STATUS);
 
-    // m_aStdColNameOrder is an array of the width for each column.
+    // m_iStdColWidthOrder is an array of the width for each column.
     // 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 6238280..f354029 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -266,11 +266,11 @@ CViewWork::CViewWork(wxNotebook* pNotebook) :
     m_aStdColNameOrder->Insert(_("Application"), COLUMN_APPLICATION);
     m_aStdColNameOrder->Insert(_("Name"), COLUMN_NAME);
     
-    // m_aStdColNameOrder is an array of the width for each column.
+    // m_iStdColWidthOrder is an array of the width for each column.
     // 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/WelcomePage.cpp b/clientgui/WelcomePage.cpp
deleted file mode 100644
index 87e31d0..0000000
--- a/clientgui/WelcomePage.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-//
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma implementation "WelcomePage.h"
-#endif
-
-#include "stdwx.h"
-#include "diagnostics.h"
-#include "util.h"
-#include "mfile.h"
-#include "miofile.h"
-#include "parse.h"
-#include "error_numbers.h"
-#include "wizardex.h"
-#include "error_numbers.h"
-#include "BOINCGUIApp.h"
-#include "SkinManager.h"
-#include "MainDocument.h"
-#include "BOINCBaseWizard.h"
-#include "WizardAttach.h"
-#include "WelcomePage.h"
-
-////@begin XPM images
-////@end XPM images
-
-
-/*!
- * CWelcomePage type definition
- */
- 
-IMPLEMENT_DYNAMIC_CLASS( CWelcomePage, wxWizardPageEx )
- 
-/*!
- * CWelcomePage event table definition
- */
- 
-BEGIN_EVENT_TABLE( CWelcomePage, wxWizardPageEx )
- 
-////@begin CWelcomePage event table entries
-    EVT_WIZARDEX_PAGE_CHANGED( -1, CWelcomePage::OnPageChanged )
-    EVT_RADIOBUTTON( ID_WELCOMESELECTWIZARDPROJECT, CWelcomePage::OnWizardSelectionChanged )
-    EVT_RADIOBUTTON( ID_WELCOMESELECTWIZARDACCOUNTMGR, CWelcomePage::OnWizardSelectionChanged )
-    EVT_RADIOBUTTON( ID_WELCOMECHANGEAPPS, CWelcomePage::OnWizardSelectionChanged )
-    EVT_WIZARDEX_CANCEL( -1, CWelcomePage::OnCancel )
-////@end CWelcomePage event table entries
- 
-END_EVENT_TABLE()
-
-/*!
- * CWelcomePage constructors
- */
- 
-CWelcomePage::CWelcomePage( )
-{
-}
- 
-CWelcomePage::CWelcomePage( CBOINCBaseWizard* parent )
-{
-    Create( parent );
-}
- 
-/*!
- * WizardPage creator
- */
- 
-bool CWelcomePage::Create( CBOINCBaseWizard* parent )
-{
-////@begin CWelcomePage member initialisation
-    m_pTitleStaticCtrl = NULL;
-    m_pDescriptionStaticCtrl = NULL;
-    m_pAttachToProjectCtrl = NULL;
-    m_pAttachToAccountManagerCtrl = NULL;
-    m_pDirectionsStaticCtrl = NULL;
-////@end CWelcomePage member initialisation
-
-#if defined (_WCG)
-	((CWizardAttach*)parent)->IsFirstPass = true;
-#else
-	((CWizardAttach*)parent)->IsFirstPass = false;
-#endif
- 
-////@begin CWelcomePage creation
-    wxWizardPageEx::Create( parent, ID_WELCOMEPAGE );
-
-    CreateControls();
-    GetSizer()->Fit(this);
-////@end CWelcomePage creation
-
-	return TRUE;
-}
- 
-// Determine if this the WCG branded version of the client
-// and connected to WCG.
-bool CWelcomePage::isWCGClient() {
-	bool                   is_wcg_client = false;
-#if defined (_WCG)
-    CMainDocument*         pDoc = wxGetApp().GetDocument();
-	CWizardAttach*         pWAP = ((CWizardAttach*)GetParent());
-
-    // Determine if we are the World Community Grid version of the client
-    // and connected to World Community Grid
-	std::string wcgUrl = "http://www.worldcommunitygrid.org/";
-	if ( pDoc->state.lookup_project(wcgUrl.c_str()) ) {
-        is_wcg_client = true;
-        pWAP->IsAttachToProjectWizard = false;
-        pWAP->IsChangeWCGApps = true;
-    }
-#endif
-	return is_wcg_client;
-}
-   
-/*!
- * Control creation for WizardPage
- */
- 
-void CWelcomePage::CreateControls()
-{    
-////@begin CWelcomePage content construction
-    CWelcomePage* itemWizardPage2 = this;
-
-    wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
-    itemWizardPage2->SetSizer(itemBoxSizer3);
-
-    m_pTitleStaticCtrl = new wxStaticText;
-    m_pTitleStaticCtrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_pTitleStaticCtrl->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
-    itemBoxSizer3->Add(m_pTitleStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
-
-    m_pDescriptionStaticCtrl = new wxStaticText;
-    m_pDescriptionStaticCtrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer3->Add(m_pDescriptionStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
-
-    itemBoxSizer3->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
-
-    wxFlexGridSizer* itemFlexGridSizer62 = new wxFlexGridSizer(0, 1, 0, 0);
-    itemFlexGridSizer62->AddGrowableCol(0);
-    itemBoxSizer3->Add(itemFlexGridSizer62, 0, wxGROW|wxALL, 5);
-
-    m_pChangeApplicationsCtrl = new wxRadioButton;
-    m_pChangeApplicationsCtrl->Create(itemWizardPage2, ID_WELCOMECHANGEAPPS, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    if ( isWCGClient() ) {
-        m_pChangeApplicationsCtrl->SetValue(TRUE);
-    } else {
-        m_pChangeApplicationsCtrl->SetValue(FALSE);
-    }
-    itemFlexGridSizer62->Add(m_pChangeApplicationsCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-    m_pAttachToProjectCtrl = new wxRadioButton;
-    m_pAttachToProjectCtrl->Create( itemWizardPage2, ID_WELCOMESELECTWIZARDPROJECT, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    if ( isWCGClient() ) {
-        m_pAttachToProjectCtrl->SetValue(FALSE);
-    } else {
-        m_pAttachToProjectCtrl->SetValue(TRUE);
-    }
-    itemFlexGridSizer62->Add(m_pAttachToProjectCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-    m_pAttachToAccountManagerCtrl = new wxRadioButton;
-    m_pAttachToAccountManagerCtrl->Create( itemWizardPage2, ID_WELCOMESELECTWIZARDACCOUNTMGR, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_pAttachToAccountManagerCtrl->SetValue(FALSE);
-    itemFlexGridSizer62->Add(m_pAttachToAccountManagerCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-    m_pDirectionsStaticCtrl = new wxStaticText;
-    m_pDirectionsStaticCtrl->Create( itemWizardPage2, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer3->Add(m_pDirectionsStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
-
-    itemWizardPage2->SetSizer(itemBoxSizer3);
-
-#ifdef __WXMAC__
-    //Accessibility
-    HIViewRef buttonView = (HIViewRef)m_pAttachToProjectCtrl->GetHandle();
-    HIObjectRef   theObject = (HIObjectRef)HIViewGetSuperview(buttonView);
-    HIObjectSetAccessibilityIgnored(theObject, true);
-#endif
-////@end CWelcomePage content construction
-}
-
-/*
- * Gets the previous page.
- */
- 
-wxWizardPageEx* CWelcomePage::GetPrev() const
-{
-    return NULL;
-}
- 
-/*!
- * Gets the next page.
- */
- 
-wxWizardPageEx* CWelcomePage::GetNext() const
-{
-    if (CHECK_CLOSINGINPROGRESS()) {
-        // Cancel Event Detected
-        return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
-    } else if (IS_ATTACHTOPROJECTWIZARD()) {
-        return PAGE_TRANSITION_NEXT(ID_PROJECTINFOPAGE);
-    } else if (IS_ACCOUNTMANAGERUPDATEWIZARD()) {
-        return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERPROCESSINGPAGE);
-    } else if (IS_ACCOUNTMANAGERWIZARD()) {
-        return PAGE_TRANSITION_NEXT(ID_ACCOUNTMANAGERINFOPAGE);
-	} else if (IS_CHANGEWCGAPPS()) {
-		if ( ((CWizardAttach*)GetParent())->IsFirstPass ) {
-			((CWizardAttach*)GetParent())->IsFirstPass = false;
-		} else {
-			this->OpenWorldCommunityGridProjectsPage();
-		}
-	}
-    return NULL;
-}
- 
-/*!
- * Should we show tooltips?
- */
- 
-bool CWelcomePage::ShowToolTips()
-{
-    return TRUE;
-}
- 
-/*!
- * Get bitmap resources
- */
- 
-wxBitmap CWelcomePage::GetBitmapResource( const wxString& WXUNUSED(name) )
-{
-    // Bitmap retrieval
-////@begin CWelcomePage bitmap retrieval
-    return wxNullBitmap;
-////@end CWelcomePage bitmap retrieval
-}
- 
-/*!
- * Get icon resources
- */
- 
-wxIcon CWelcomePage::GetIconResource( const wxString& WXUNUSED(name) )
-{
-    // Icon retrieval
-////@begin CWelcomePage icon retrieval
-    return wxNullIcon;
-////@end CWelcomePage icon retrieval
-}
-
-/*!
- * wxEVT_WIZARD_PAGE_CHANGED event handler for ID_WELCOMEPAGE
- */
- 
-void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
-    if (event.GetDirection() == false) return;
-    wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnPageChanged - Function Begin"));
-
-    CMainDocument*         pDoc = wxGetApp().GetDocument();
-    ACCT_MGR_INFO          ami;
-    bool                   is_acct_mgr_detected = false;
-    bool                   is_wcg_client = isWCGClient();
-    wxString               strBuffer = wxEmptyString;
-
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
-    wxASSERT(m_pTitleStaticCtrl);
-    wxASSERT(m_pDescriptionStaticCtrl);
-    wxASSERT(m_pAttachToProjectCtrl);
-    wxASSERT(m_pAttachToAccountManagerCtrl);
-    wxASSERT(m_pDirectionsStaticCtrl);
-    wxASSERT(m_pChangeApplicationsCtrl);
-
-	if ( !is_wcg_client ) {
-		m_pTitleStaticCtrl->SetLabel(
-			_("Add project or account manager")
-		);
-	} else {
-		m_pTitleStaticCtrl->SetLabel(
-			_("Add project or use BOINC Account Manager")
-		);
-	}
-
-    pDoc->rpc.acct_mgr_info(ami);
-    is_acct_mgr_detected = ami.acct_mgr_url.size() ? true : false;
-
-    if (is_acct_mgr_detected) {
-        strBuffer.Printf(
-            _("If possible, add projects at the\n%s web site.\n\nProjects added via this wizard will not be\nlisted on or managed via %s."), 
-            wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str(),
-            wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
-        );
-
-        m_pDescriptionStaticCtrl->SetLabel(
-            strBuffer
-        );
-
-		m_pAttachToAccountManagerCtrl->SetLabel(
-			_("Use account manager")
-		);
-        m_pAttachToAccountManagerCtrl->Disable();
-    } else {
-        if (!is_wcg_client) {
-            m_pDescriptionStaticCtrl->SetLabel(
-_("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.")
-            );
-
-			m_pAttachToAccountManagerCtrl->SetLabel(
-				_("Use account manager")
-			);
-        } else {
-            m_pDescriptionStaticCtrl->SetLabel(
-_("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")
-            );
-
-			m_pAttachToAccountManagerCtrl->SetLabel(
-				_("Use a BOINC Account Manager")
-			);
-        }
-
-		m_pAttachToAccountManagerCtrl->Enable();
-    }
-
-    if (!is_wcg_client) {
-		m_pAttachToProjectCtrl->SetLabel(
-			_("Add project")
-		);
-
-        m_pDirectionsStaticCtrl->SetLabel(
-            _("To continue, click Next.")
-        );
-
-        m_pChangeApplicationsCtrl->Hide();
-	} else {
-        m_pChangeApplicationsCtrl->SetLabel(
-			 _("Add or change your World Community Grid projects")
-        );
-		m_pAttachToProjectCtrl->SetLabel(
-			_("Add projects run by other researchers or organizations")
-		);
-	}
- 
-    Fit();
-    wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnPageChanged - Function End"));
-}
-
-
-/*!
- * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_WELCOMESELECTWIZARDPROJECT
- *   or ID_WELCOMESELECTWIZARDACCOUNTMGR
- */
- 
-void CWelcomePage::OnWizardSelectionChanged( wxCommandEvent& event ) {
-    wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnWizardSelectionChanged - Function Begin"));
-
-    CWizardAttach*  pWAP = ((CWizardAttach*)GetParent());
-
-    wxASSERT(pWAP);
-    wxASSERT(wxDynamicCast(pWAP, CWizardAttach));
-
-    if (ID_WELCOMESELECTWIZARDPROJECT == event.GetId()) {
-        pWAP->IsAttachToProjectWizard = true;
-        pWAP->IsAccountManagerWizard = false;
-		pWAP->IsChangeWCGApps = false;
-    } else if (ID_WELCOMESELECTWIZARDACCOUNTMGR == event.GetId()) {
-        pWAP->IsAttachToProjectWizard = false;
-        pWAP->IsAccountManagerWizard = true;
-		pWAP->IsChangeWCGApps = false;
-	} else if (ID_WELCOMECHANGEAPPS == event.GetId()) {
-        pWAP->IsAttachToProjectWizard = false;
-        pWAP->IsAccountManagerWizard = false;
-		pWAP->IsChangeWCGApps = true;
-	}
-
-    wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OnWizardSelectionChanged - Function End"));
-}
-
-
-/*!
- * wxEVT_BUTTON event handler for ID_WELCOMECHANGEAPPS
- */
-
-void CWelcomePage::OpenWorldCommunityGridProjectsPage() const {
-    wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OpenWorldCommunityGridProjectsPage - Function Begin"));
-    CWizardAttach*  pWAP = ((CWizardAttach*)GetParent());
-
-    wxASSERT(pWAP);
-    wxASSERT(wxDynamicCast(pWAP, CWizardAttach));
-
-    wxLaunchDefaultBrowser(wxT("http://www.worldcommunitygrid.org/ms/viewMyProjects.do"));
-
-    pWAP->SimulateCancelButton();
-
-    wxLogTrace(wxT("Function Start/End"), wxT("CWelcomePage::OpenWorldCommunityGridProjectsPage - Function End"));
-}
-
-
-/*!
- * wxEVT_WIZARD_CANCEL event handler for ID_WELCOMEPAGE
- */
- 
-void CWelcomePage::OnCancel( wxWizardExEvent& event ) {
-    PROCESS_CANCELEVENT(event);
-}
diff --git a/clientgui/WelcomePage.h b/clientgui/WelcomePage.h
deleted file mode 100644
index 0585ec9..0000000
--- a/clientgui/WelcomePage.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-//
-#ifndef _WIZ_WELCOMEPAGE_H_
-#define _WIZ_WELCOMEPAGE_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "WelcomePage.cpp"
-#endif
-
-/*!
- * CWelcomePage class declaration
- */
-
-class CWelcomePage: public wxWizardPageEx
-{    
-    DECLARE_DYNAMIC_CLASS( CWelcomePage )
-    DECLARE_EVENT_TABLE()
-
-public:
-    /// Constructors
-    CWelcomePage( );
-
-    CWelcomePage( CBOINCBaseWizard* parent );
-
-    /// Creation
-    bool Create( CBOINCBaseWizard* parent );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin CWelcomePage event handler declarations
-
-    /// wxEVT_WIZARD_PAGE_CHANGED event handler for ID_WELCOMEPAGE
-    void OnPageChanged( wxWizardExEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for
-    ///   ID_WELCOMESELECTWIZARDPROJECT or ID_WELCOMESELECTWIZARDACCOUNTMGR
-    void OnWizardSelectionChanged( wxCommandEvent& event );
-
-    /// wxEVT_WIZARD_CANCEL event handler for ID_WELCOMEPAGE
-    void OnCancel( wxWizardExEvent& event );
-
-////@end CWelcomePage event handler declarations
-
-////@begin CWelcomePage member function declarations
-
-    /// Logic to handle when the user chooses to change World Community Grid projects selected
-    void OpenWorldCommunityGridProjectsPage() const;
-
-    /// Gets the previous page.
-    virtual wxWizardPageEx* GetPrev() const;
-
-    /// Gets the next page.
-    virtual wxWizardPageEx* GetNext() const;
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-
-////@end CWelcomePage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-    // Determine if this the WCG branded version of the client
-    // and connected to WCG.
-    bool isWCGClient();
-
-////@begin CWelcomePage member variables
-    wxStaticText* m_pTitleStaticCtrl;
-    wxStaticText* m_pDescriptionStaticCtrl;
-    wxStaticText* m_pDirectionsStaticCtrl;
-    wxRadioButton* m_pAttachToProjectCtrl;
-    wxRadioButton* m_pAttachToAccountManagerCtrl;
-	wxRadioButton* m_pChangeApplicationsCtrl;
-////@end CWelcomePage member variables
-};
-
-#endif // _WIZ_WELCOMEPAGE_H_
diff --git a/clientgui/WizardAttach.cpp b/clientgui/WizardAttach.cpp
index 870fc56..7e957cf 100644
--- a/clientgui/WizardAttach.cpp
+++ b/clientgui/WizardAttach.cpp
@@ -35,7 +35,6 @@
 #include "BOINCBaseWizard.h"
 #include "BOINCBaseFrame.h"
 #include "WizardAttach.h"
-#include "WelcomePage.h"
 #include "ProjectInfoPage.h"
 #include "ProjectPropertiesPage.h"
 #include "ProjectProcessingPage.h"
@@ -93,7 +92,6 @@ bool CWizardAttach::Create( wxWindow* parent, wxWindowID id, const wxString& /*
 {
 
 ////@begin CWizardAttach member initialisation
-    m_WelcomePage = NULL;
     m_ProjectInfoPage = NULL;
     m_ProjectPropertiesPage = NULL;
     m_ProjectProcessingPage = NULL;
@@ -179,10 +177,6 @@ void CWizardAttach::CreateControls()
 ////@begin CWizardAttach content construction
     CWizardAttach* itemWizard1 = this;
 
-    m_WelcomePage = new CWelcomePage;
-    m_WelcomePage->Create( itemWizard1 );
-    GetPageAreaSizer()->Add(m_WelcomePage);
-
     m_AccountManagerInfoPage = new CAccountManagerInfoPage;
     m_AccountManagerInfoPage->Create( itemWizard1 );
     GetPageAreaSizer()->Add(m_AccountManagerInfoPage);
@@ -286,10 +280,14 @@ bool CWizardAttach::Run(
         }
     }
 
-    if (strProjectURL.Length() && m_ProjectPropertiesPage) {
-        return RunWizard(m_ProjectPropertiesPage);
-    } else if (m_WelcomePage) {
-        return RunWizard(m_WelcomePage);
+    if (m_ProjectPropertiesPage || m_ProjectInfoPage) {
+        IsAttachToProjectWizard = true;
+        IsAccountManagerWizard = false;
+        if (strProjectURL.Length()) {
+            return RunWizard(m_ProjectPropertiesPage);
+        } else {
+            return RunWizard(m_ProjectInfoPage);
+        }
     }
 
     return FALSE;
@@ -308,6 +306,8 @@ bool CWizardAttach::RunSimpleProjectAttach(
     }
     SetProjectKnown(strKnown.length() > 0);
 
+    IsAttachToProjectWizard = true;
+    IsAccountManagerWizard = false;
     return RunWizard(m_ProjectWelcomePage);
 }
 
@@ -360,8 +360,14 @@ bool CWizardAttach::SyncToAccountManager() {
         }
     }
 
-    if (m_AccountManagerPropertiesPage) {
-        return RunWizard(m_AccountManagerPropertiesPage);
+    if (m_AccountManagerInfoPage || m_AccountManagerPropertiesPage) {
+        IsAttachToProjectWizard = false;
+        IsAccountManagerWizard = true;
+        if (!ami.acct_mgr_url.size()) {
+            return RunWizard(m_AccountManagerInfoPage);
+        } else {
+            return RunWizard(m_AccountManagerPropertiesPage);
+        }
     }
 
     return FALSE;
@@ -426,7 +432,15 @@ bool CWizardAttach::HasNextPage( wxWizardPageEx* page )
  
 bool CWizardAttach::HasPrevPage( wxWizardPageEx* page )
 {
-    if ((page == m_WelcomePage) || (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;
 }
@@ -477,9 +491,6 @@ wxWizardPageEx* CWizardAttach::_PushPageTransition( wxWizardPageEx* pCurrentPage
     if (GetCurrentPage()) {
         wxWizardPageEx* pPage = NULL;
 
-        if (ID_WELCOMEPAGE == ulPageID)
-            pPage = m_WelcomePage;
- 
         if (ID_PROJECTINFOPAGE == ulPageID)
             pPage = m_ProjectInfoPage;
  
@@ -575,7 +586,6 @@ void CWizardAttach::_ProcessCancelEvent( wxWizardExEvent& event ) {
     if (IsAttachToProjectWizard) {
         bCancelWithoutNextPage |= (page == m_ErrAlreadyExistsPage);
     } else {
-        bCancelWithoutNextPage |= (page == m_WelcomePage);
         bCancelWithoutNextPage |= (page == m_ProjectWelcomePage);
    }
 
diff --git a/clientgui/WizardAttach.h b/clientgui/WizardAttach.h
index 056920e..07b78a3 100644
--- a/clientgui/WizardAttach.h
+++ b/clientgui/WizardAttach.h
@@ -33,7 +33,6 @@
 //
 
 // Generic Pages
-#define ID_WELCOMEPAGE 10100
 #define ID_ACCOUNTINFOPAGE 10102
 #define ID_COMPLETIONPAGE 10103
 #define ID_COMPLETIONERRORPAGE 10104
@@ -133,7 +132,6 @@
 
 // Forward declare the generic page classes
 //
-class CWelcomePage;
 class CAccountInfoPage;
 class CTermsOfUsePage;
 class CCompletionPage;
@@ -320,7 +318,6 @@ public:
     static bool ShowToolTips();
 
 ////@begin CWizardAttachProject member variables
-    CWelcomePage* m_WelcomePage;
     CProjectInfoPage* m_ProjectInfoPage;
     CProjectPropertiesPage* m_ProjectPropertiesPage;
     CProjectProcessingPage* m_ProjectProcessingPage;
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index 57a821f..eabeb47 100755
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -68,6 +68,7 @@ IMPLEMENT_DYNAMIC_CLASS(CSimpleFrame, CBOINCBaseFrame)
 
 BEGIN_EVENT_TABLE(CSimpleFrame, CBOINCBaseFrame)
     EVT_SIZE(CSimpleFrame::OnSize)
+    EVT_MENU_OPEN(CSimpleFrame::OnMenuOpening)
     EVT_MENU(ID_CHANGEGUI, CSimpleFrame::OnChangeGUI)
     EVT_MENU(ID_SGDEFAULTSKINSELECTOR, CSimpleFrame::OnSelectDefaultSkin)
     EVT_MENU_RANGE(ID_SGFIRSTSKINSELECTOR, ID_LASTSGSKINSELECTOR, CSimpleFrame::OnSelectSkin)
@@ -78,6 +79,7 @@ BEGIN_EVENT_TABLE(CSimpleFrame, CBOINCBaseFrame)
     EVT_MENU(ID_PREFERENCES, CSimpleFrame::OnPreferences)
     EVT_MENU(ID_SGOPTIONS, CSimpleFrame::OnOptions)
 	EVT_MENU(ID_SGDIAGNOSTICLOGFLAGS, CSimpleFrame::OnDiagnosticLogFlags)
+    EVT_MENU(ID_WIZARDATTACHPROJECT, CSimpleFrame::OnProjectsAttachToProject)
     EVT_MENU(ID_HELPBOINC, CSimpleFrame::OnHelpBOINC)
     EVT_MENU(ID_HELPBOINCMANAGER, CSimpleFrame::OnHelpBOINC)
     EVT_MENU(ID_HELPBOINCWEBSITE, CSimpleFrame::OnHelpBOINC)
@@ -143,9 +145,10 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
     );
 
 #ifdef __WXMAC__
+    // wxWidgets actually puts this in the BOINCManager menu
     menuFile->Append(
         wxID_PREFERENCES,
-        _("Preferences…")
+        _("Preferences...")
     );
 #endif
 
@@ -168,39 +171,47 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
         _("Select the appearance of the user interface.")
     );
 
-    // Skins sumenu always contains the Default entry
+    // Skins submenu always contains the Default entry
     if (m_pSubmenuSkins->GetMenuItemCount() <= 1) {
         menuView->Enable(ID_SGSKINSELECTOR, false);
     }
     menuView->AppendSeparator();
     menuView->Append(
-        ID_EVENTLOG, 
-        _("Event Log...\tCtrl+Shift+E"),
-        _("Display diagnostic messages.")
-    );
-    menuView->AppendSeparator();
-    menuView->Append(
         ID_CHANGEGUI,
         _("Advanced View...\tCtrl+Shift+A"),
         _("Display the advanced graphical interface.")
     );
 
 
-    // Tools menu
-    wxMenu *menuTools = new wxMenu;
+    // Options menu
+    wxMenu *menuOptions = new wxMenu;
 
-    menuTools->Append(
+    menuOptions->Append(
         ID_PREFERENCES,
         _("Computing &preferences..."),
         _("Configure computing preferences")
     );
     
-    menuTools->Append(
+    menuOptions->Append(
         ID_SGOPTIONS, 
         _("&Other options..."),
         _("Configure display options and proxy settings")
     );
 
+    // Tools menu
+    wxMenu *menuTools = new wxMenu;
+    menuTools->Append(
+        ID_WIZARDATTACHPROJECT, 
+        _("&Add project..."),
+        _("Add a project")
+    );
+    menuTools->AppendSeparator();
+    menuTools->Append(
+        ID_EVENTLOG, 
+        _("Event Log...\tCtrl+Shift+E"),
+        _("Display diagnostic messages.")
+    );
+
     // Help menu
     wxMenu *menuHelp = new wxMenu;
 
@@ -268,10 +279,14 @@ CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position
         _("&View")
     );
     m_pMenubar->Append(
-        menuTools,
+        menuOptions,
         _("&Options")
     );
     m_pMenubar->Append(
+        menuTools,
+        _("&Tools")
+    );
+    m_pMenubar->Append(
         menuHelp,
         _("&Help")
     );
@@ -369,6 +384,44 @@ int CSimpleFrame::_GetCurrentViewPage() {
 }
 
 
+void CSimpleFrame::OnMenuOpening( wxMenuEvent &event) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnMenuOpening - Function Begin"));
+
+    CMainDocument*     pDoc = wxGetApp().GetDocument();
+    wxMenu* menuFile = NULL;
+    wxMenu* menuHelp = NULL;
+    
+    wxASSERT(pDoc);
+    
+    bool isConnected = pDoc->IsConnected();
+    wxMenu* menu = event.GetMenu();
+    
+    menu->FindItem(ID_CLOSEWINDOW, &menuFile);
+    menu->FindItem(ID_HELPBOINC, &menuHelp);
+    size_t numItems = menu->GetMenuItemCount();
+    for (size_t pos = 0; pos < numItems; ++pos) {
+        wxMenuItem * item = menu->FindItemByPosition(pos);
+        if ((menu == menuFile) || (menu == menuHelp)) {
+            // Always enable all items in File menu or Help menu:
+            // ID_CLOSEWINDOW, wxID_EXIT, ID_HELPBOINC, ID_HELPBOINCMANAGER,
+            // ID_HELPBOINCWEBSITE, wxID_ABOUT
+            item->Enable(true);
+        } else {
+            // Disable other menu items if not connected to client
+            item->Enable(isConnected);
+        }
+    }
+    
+    // wxID_EXIT and wxID_PREFERENCES are not in File menu on some platforms
+    wxMenuItem* exitItem = menu->FindChildItem(wxID_EXIT, NULL);
+    if (exitItem) {
+        exitItem->Enable(true);
+    }
+    
+    wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnMenuOpening - Function End"));
+}
+
+
 void CSimpleFrame::OnChangeGUI(wxCommandEvent& WXUNUSED(event)) {
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleFrame::OnChangeGUI - Function Begin"));
 
@@ -485,7 +538,9 @@ void CSimpleFrame::OnPreferences(wxCommandEvent& WXUNUSED(event)) {
 	m_pBackgroundPanel->SetDlgOpen(true);
 
 	CDlgPreferences dlg(GetParent());
-    dlg.ShowModal();
+    if (dlg.OKToShow()) {
+        dlg.ShowModal();
+    }
 
     m_pBackgroundPanel->SetDlgOpen(false);
 
@@ -630,7 +685,7 @@ void CSimpleFrame::OnRefreshView(CFrameEvent& WXUNUSED(event)) {
 }
 
 
-void CSimpleFrame::OnProjectsAttachToProject() {
+void CSimpleFrame::OnProjectsAttachToProject(wxCommandEvent& WXUNUSED(event)) {
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleFrame::OnProjectsAttachToProject - Function Begin"));
 
     CMainDocument* pDoc     = wxGetApp().GetDocument();
@@ -930,7 +985,6 @@ void CSimpleGUIPanel::SetBackgroundBitmap() {
 
     wxColour bgColor(*pSkinSimple->GetBackgroundImage()->GetBackgroundColor());
     SetBackgroundColour(bgColor);
-
     wxRect panelRect = GetRect();
     m_bmpBg = wxBitmap(panelRect.width, panelRect.height);
     wxMemoryDC dc(m_bmpBg);
@@ -945,7 +999,68 @@ void CSimpleGUIPanel::SetBackgroundBitmap() {
     dc.SetPen(bgPen);
     dc.DrawRectangle(panelRect);
 #endif
-    dc.DrawBitmap(*pSkinSimple->GetBackgroundImage()->GetBitmap(), 0, 0, false);
+
+    int srcX, srcY, destX, destY, h, w;
+    wxBitmap* srcBmp = pSkinSimple->GetBackgroundImage()->GetBitmap();
+    wxSize srcSize = srcBmp->GetSize();
+    switch(pSkinSimple->GetBackgroundImage()->GetHorizontalAnchor()) {
+    case BKGD_ANCHOR_HORIZ_LEFT:
+    default:
+        srcX = 0;
+        destX = 0;
+        break;
+    case BKGD_ANCHOR_HORIZ_CENTER:
+        if (panelRect.width < srcSize.GetWidth()) {
+            srcX = (srcSize.GetWidth() - panelRect.width) / 2;
+            destX = 0;
+        } else {
+            srcX = 0;
+            destX = (panelRect.width - srcSize.GetWidth()) / 2;
+        }
+        break;
+    case BKGD_ANCHOR_HORIZ_RIGHT:
+        if (panelRect.width < srcSize.GetWidth()) {
+            srcX = (srcSize.GetWidth() - panelRect.width);
+            destX = 0;
+        } else {
+            srcX = 0;
+            destX = (panelRect.width - srcSize.GetWidth());
+        }
+        break;
+    }
+    w = wxMin(panelRect.width, srcSize.GetWidth());
+
+    switch(pSkinSimple->GetBackgroundImage()->GetVerticalAnchor()) {
+    case BKGD_ANCHOR_VERT_TOP:
+    default:
+        srcY = 0;
+        destY = 0;
+        break;
+    case BKGD_ANCHOR_VERT_CENTER:
+        if (panelRect.height < srcSize.GetHeight()) {
+            srcY = (srcSize.GetHeight() - panelRect.height) / 2;
+            destY = 0;
+        } else {
+            srcY = 0;
+            destY = (panelRect.height - srcSize.GetHeight()) / 2;
+        }
+        break;
+    case BKGD_ANCHOR_VERT_BOTTOM:
+        if (panelRect.height < srcSize.GetHeight()) {
+            srcY = (srcSize.GetHeight() - panelRect.height);
+            destY = 0;
+        } else {
+            srcY = 0;
+            destY = (panelRect.height - srcSize.GetHeight());
+        }
+        break;
+    }
+    h = wxMin(panelRect.height, srcSize.GetHeight());
+
+    wxMemoryDC srcDC(*srcBmp);
+    dc.Blit(destX, destY, w, h, &srcDC, srcX, srcY, wxCOPY);
+
+//    dc.DrawBitmap(*pSkinSimple->GetBackgroundImage()->GetBitmap(), 0, 0, false);
 
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleGUIPanel::SetBackgroundBitmap - Function End"));
 }
@@ -968,13 +1083,13 @@ void CSimpleGUIPanel::ReskinInterface() {
 }
 
 
-void CSimpleGUIPanel::OnProjectsAttachToProject() {
+void CSimpleGUIPanel::OnProjectsAttachToProject(wxCommandEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleGUIPanel::OnProjectsAttachToProject - Function Begin"));
 	
     CSimpleFrame* pFrame = wxDynamicCast(GetParent(), CSimpleFrame);
     wxASSERT(pFrame);
 
-    pFrame->OnProjectsAttachToProject();
+    pFrame->OnProjectsAttachToProject(event);
 
     wxLogTrace(wxT("Function Start/End"), wxT("CSimpleFrame::OnProjectsAttachToProject - Function End"));
 }
diff --git a/clientgui/sg_BoincSimpleFrame.h b/clientgui/sg_BoincSimpleFrame.h
index 9c48d95..cf08e4d 100644
--- a/clientgui/sg_BoincSimpleFrame.h
+++ b/clientgui/sg_BoincSimpleFrame.h
@@ -50,7 +50,7 @@ public:
     void ReskinInterface();
 	void UpdateProjectView();
     void OnFrameRender();
-	void OnProjectsAttachToProject();
+	void OnProjectsAttachToProject(wxCommandEvent& event);
     void OnShowNotices(wxCommandEvent& event);
     void OnSuspendResume(wxCommandEvent& event);
     void OnHelp( wxCommandEvent& event );
@@ -102,6 +102,7 @@ public:
 
    ~CSimpleFrame();
 
+    void OnMenuOpening( wxMenuEvent &event);
     void OnChangeGUI( wxCommandEvent& event );
     void BuildSkinSubmenu( wxMenu *submenu );
     void OnSelectDefaultSkin( wxCommandEvent& event );
@@ -114,7 +115,7 @@ public:
     void OnHelpBOINC( wxCommandEvent& event );
     void OnHelpAbout( wxCommandEvent& event );
 
-    void OnProjectsAttachToProject();
+    void OnProjectsAttachToProject(wxCommandEvent& event);
 
 	void OnConnect(CFrameEvent& event );
     void OnReloadSkin( CFrameEvent& event );
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index bfea64b..823f0fa 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -132,104 +132,100 @@ void CPanelPreferences::CreateControls()
     wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
     itemDialog1->SetSizer(itemBoxSizer2);
 
-    wxStaticBox* topSectionStaticBox = new wxStaticBox();
-    topSectionStaticBox->SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
-    topSectionStaticBox->Create(this, -1, wxEmptyString);
-
-    wxStaticBoxSizer* topSectionSizer = new wxStaticBoxSizer( topSectionStaticBox, wxVERTICAL );
-
-    wxBoxSizer* topControlsSizer = new wxBoxSizer( wxHORIZONTAL );
-    topSectionSizer->Add(topControlsSizer);
-    
-    wxBitmap warningBmp = GetScaledBitmapFromXPMData(warning_xpm);
-    CTransparentStaticBitmap* bmpWarning = new CTransparentStaticBitmap(
-                                topSectionStaticBox, wxID_ANY, 
-                                warningBmp, 
-                                wxDefaultPosition, wxDefaultSize, 0
-                                );
-    bmpWarning->SetMinSize( warningBmp.GetSize() );
-
-    topControlsSizer->Add( bmpWarning, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
-
-    wxBoxSizer* legendSizer = new wxBoxSizer( wxVERTICAL );
-
     bool usingLocalPrefs = doesLocalPrefsFileExist();
-    if (usingLocalPrefs) {
-        legendSizer->Add(
-            new CTransparentStaticText( topSectionStaticBox, wxID_ANY,
-                        _("Using local preferences.\n"
-                        "Click \"Use web prefs\" to use web-based preferences from"
-                        ), wxDefaultPosition, wxDefaultSize, 0 ),
-            0, wxALL, 1
-        );
-    } else {
-        legendSizer->Add(
-            new CTransparentStaticText( topSectionStaticBox, wxID_ANY,
-                        _("Using web-based preferences from"),
-                        wxDefaultPosition, wxDefaultSize, 0 ),
-            0, wxALL, 1
-        );
-    }
-    
-     legendSizer->Add(
-        new CTransparentHyperlinkCtrl(
-            topSectionStaticBox, wxID_ANY, *web_prefs_url, *web_prefs_url,
-            wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE,
-            wxHyperlinkCtrlNameStr, &m_backgroundBitmap
-        ),
-        0, wxLEFT, 5
-    );
-    
-    if (!usingLocalPrefs) {
-        legendSizer->Add(
-            new CTransparentStaticText( topSectionStaticBox, wxID_ANY,
-                 _("Set values and click OK to use local preferences instead."),
-                 wxDefaultPosition, wxDefaultSize, 0 ),
-            0, wxALL, 1
+    if (! web_prefs_url->IsEmpty()) {
+        wxStaticBox* topSectionStaticBox = new wxStaticBox();
+        topSectionStaticBox->SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
+        topSectionStaticBox->Create(this, -1, wxEmptyString);
+
+        wxStaticBoxSizer* topSectionSizer = new wxStaticBoxSizer( topSectionStaticBox, wxVERTICAL );
+
+        wxBoxSizer* topControlsSizer = new wxBoxSizer( wxHORIZONTAL );
+        topSectionSizer->Add(topControlsSizer);
+        
+        wxBitmap warningBmp = GetScaledBitmapFromXPMData(warning_xpm);
+        CTransparentStaticBitmap* bmpWarning = new CTransparentStaticBitmap(
+                                    topSectionStaticBox, wxID_ANY, 
+                                    warningBmp, 
+                                    wxDefaultPosition, wxDefaultSize, 0
+                                    );
+        bmpWarning->SetMinSize( warningBmp.GetSize() );
+
+        topControlsSizer->Add( bmpWarning, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
+
+        wxBoxSizer* legendSizer = new wxBoxSizer( wxVERTICAL );
+
+        if (usingLocalPrefs) {
+            legendSizer->Add(
+                new CTransparentStaticText( topSectionStaticBox, wxID_ANY,
+                            _("Using local preferences.\n"
+                            "Click \"Use web prefs\" to use web-based preferences from"
+                            ), wxDefaultPosition, wxDefaultSize, 0 ),
+                0, wxALL, 1
+            );
+        } else {
+            legendSizer->Add(
+                new CTransparentStaticText( topSectionStaticBox, wxID_ANY,
+                            _("Using web-based preferences from"),
+                            wxDefaultPosition, wxDefaultSize, 0 ),
+                0, wxALL, 1
+            );
+        }
+        
+         legendSizer->Add(
+            new CTransparentHyperlinkCtrl(
+                topSectionStaticBox, wxID_ANY, *web_prefs_url, *web_prefs_url,
+                wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE,
+                wxHyperlinkCtrlNameStr, &m_backgroundBitmap
+            ),
+            0, wxLEFT, 5
         );
-    }
-  
+        
+        if (!usingLocalPrefs) {
+            legendSizer->Add(
+                new CTransparentStaticText( topSectionStaticBox, wxID_ANY,
+                     _("Set values and click OK to use local preferences instead."),
+                     wxDefaultPosition, wxDefaultSize, 0 ),
+                0, wxALL, 1
+            );
+        }
+      
 #if 1
-    topSectionSizer->AddSpacer( 10 );
+        topSectionSizer->AddSpacer( 10 );
 
-    CTransparentStaticLine* itemStaticLine8 = new CTransparentStaticLine( topSectionStaticBox, wxID_ANY, 
-                                                                        wxDefaultPosition, 
-                                                                        wxSize(ADJUSTFORXDPI(300), 1),
-                                                                         wxLI_HORIZONTAL|wxNO_BORDER
-                                                                         );
-    itemStaticLine8->SetLineColor(pSkinSimple->GetStaticLineColor());
-    topSectionSizer->Add(itemStaticLine8, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT, ADJUSTFORXDPI(20));
+        CTransparentStaticLine* itemStaticLine8 = new CTransparentStaticLine( topSectionStaticBox, wxID_ANY, 
+                                                                            wxDefaultPosition, 
+                                                                            wxSize(ADJUSTFORXDPI(300), 1),
+                                                                             wxLI_HORIZONTAL|wxNO_BORDER
+                                                                             );
+        itemStaticLine8->SetLineColor(pSkinSimple->GetStaticLineColor());
+        topSectionSizer->Add(itemStaticLine8, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT, ADJUSTFORXDPI(20));
 
-    topSectionSizer->AddSpacer( 10 );
+        topSectionSizer->AddSpacer( 10 );
 
-    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);
+        CTransparentStaticText* itemStaticText7 = new CTransparentStaticText( topSectionStaticBox, wxID_ANY, _("For additional settings, select Computing Preferences in the Advanced View."), wxDefaultPosition, wxDefaultSize, 0 );
+        
+        topSectionSizer->Add(itemStaticText7, 0, wxALL, 0);
 
-    topSectionSizer->AddSpacer( 10 );
+        topSectionSizer->AddSpacer( 10 );
 #endif
 
-    topControlsSizer->Add( legendSizer, 1, wxALL, 1 );
+        topControlsSizer->Add( legendSizer, 1, wxALL, 1 );
 
-    m_btnClear = new wxButton( topSectionStaticBox, ID_SGPREFERENCESCLEAR, _("Use web prefs"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_btnClear->SetToolTip( _("Restore web-based preferences and close the dialog.") );
-    if (!usingLocalPrefs) {
-        m_btnClear->Hide();
-    }
-    
-    topControlsSizer->Add( m_btnClear, 0, wxALIGN_BOTTOM|wxALL, 4 );
+        m_btnClear = new wxButton( topSectionStaticBox, ID_SGPREFERENCESCLEAR, _("Use web prefs"), wxDefaultPosition, wxDefaultSize, 0 );
+        m_btnClear->SetToolTip( _("Restore web-based preferences and close the dialog.") );
+        if (!usingLocalPrefs) {
+            m_btnClear->Hide();
+        }
+        
+        topControlsSizer->Add( m_btnClear, 0, wxALIGN_BOTTOM|wxALL, 4 );
 
 #ifdef __WXMAC__
-    itemBoxSizer2->Add( topSectionSizer, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 10 );
+        itemBoxSizer2->Add( topSectionSizer, 0, wxTOP|wxLEFT|wxRIGHT|wxEXPAND, 10 );
 #else
-    itemBoxSizer2->Add( topSectionSizer, 0, wxALL|wxEXPAND, 5 );
+        itemBoxSizer2->Add( topSectionSizer, 0, wxALL|wxEXPAND, 5 );
 #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));
@@ -352,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));
     
@@ -442,20 +433,41 @@ void CPanelPreferences::MakeBackgroundBitmap() {
         wxImage img = bmp.ConvertToImage();
         img.Rescale((int) sz.x, (int) sz.y);
 
-        // Draw our cool background (centered)
+        // Draw our cool background (enlarged and centered)
         dc.DrawBitmap(wxBitmap(img), 0, 0);
     } else {
-        // Snag the center of the bitmap and use it
-        //   for the background image
-        x = wxMax(0, (w - sz.x)/2);
-        y = wxMax(0, (h - sz.y)/2);
+        switch(pSkinSimple->GetDialogBackgroundImage()->GetHorizontalAnchor()) {
+        case BKGD_ANCHOR_HORIZ_LEFT:
+        default:
+            x = 0;
+            break;
+        case BKGD_ANCHOR_HORIZ_CENTER:
+            x = (w - sz.x) / 2;
+            break;
+        case BKGD_ANCHOR_HORIZ_RIGHT:
+            x = w - sz.x;
+            break;
+        }
+
+        switch(pSkinSimple->GetDialogBackgroundImage()->GetVerticalAnchor()) {
+        case BKGD_ANCHOR_VERT_TOP:
+        default:
+            y = 0;
+            break;
+        case BKGD_ANCHOR_VERT_CENTER:
+            y = (h - sz.y) /2;
+            break;
+        case BKGD_ANCHOR_VERT_BOTTOM:
+            y = h - sz.y;
+            break;
+        }
 
         // Select the desired bitmap into the memory DC so we can take
-        //   the center chunk of it.
+        //   the desired chunk of it.
         memDC.SelectObject(bmp);
 
-        // Draw the center chunk on the window
-        dc.Blit(0, 0, w, h, &memDC, x, y, wxCOPY);
+        // Draw the desired chunk on the window
+        dc.Blit(0, 0, sz.x, sz.y, &memDC, x, y, wxCOPY);
 
         // Drop the bitmap
         memDC.SelectObject(wxNullBitmap);
@@ -627,6 +639,12 @@ bool CPanelPreferences::ReadPreferenceSettings() {
         global_preferences_working = pDoc->state.global_prefs;
         retval = pDoc->rpc.get_global_prefs_override_struct(global_preferences_working, global_preferences_mask);
     }
+    if (retval) {
+        m_bOKToShow = false;
+        return true;
+    }
+    
+    m_bOKToShow = true;
 
 #if 0   // We might use this to tell user whether local prefs exist
     if (!retval && global_preferences_override_mask.are_simple_prefs_set()) {
@@ -750,7 +768,9 @@ bool CPanelPreferences::SavePreferenceSettings() {
 bool CPanelPreferences::ValidateInput() {
     wxString invMsgFloat = _("Invalid number");
     wxString invMsgTime = _("Invalid time, value must be between 0:00 and 24:00, format is HH:MM");
+    wxString invMsgTimeSpan = _("Start time must be different from end time");
     wxString invMsgLimit100 = _("Number must be between 0 and 100");
+    double startTime, endTime;
     wxString buffer;
 
     if(m_txtProcIdleFor->IsEnabled()) {
@@ -772,6 +792,12 @@ bool CPanelPreferences::ValidateInput() {
             ShowErrorMessage(invMsgTime,m_txtProcEveryDayStop);
             return false;
         }
+        startTime = TimeStringToDouble(m_txtProcEveryDayStart->GetValue());
+        endTime = TimeStringToDouble(m_txtProcEveryDayStop->GetValue());
+        if (startTime == endTime) {
+            ShowErrorMessage(invMsgTimeSpan,m_txtProcEveryDayStop);
+            return false;
+        }
     }
     
     buffer = m_txtProcUseCPUTime->GetValue();
@@ -791,6 +817,12 @@ bool CPanelPreferences::ValidateInput() {
             ShowErrorMessage(invMsgTime,m_txtNetEveryDayStop);
             return false;
         }
+        startTime = TimeStringToDouble(m_txtNetEveryDayStart->GetValue());
+        endTime = TimeStringToDouble(m_txtNetEveryDayStop->GetValue());
+        if (startTime == endTime) {
+            ShowErrorMessage(invMsgTimeSpan,m_txtNetEveryDayStop);
+            return false;
+        }
     }
     
     if (m_chkDiskMaxSpace->IsChecked()) {
@@ -990,10 +1022,14 @@ bool CPanelPreferences::doesLocalPrefsFileExist() {
     web_prefs.init();
     
     retval = pDoc->rpc.get_global_prefs_file(s);
-    mf.init_buf_read(s.c_str());
-    XML_PARSER xp(&mf);
-    web_prefs.parse(xp, "", found_venue, mask);
-    web_prefs_url = new wxString(web_prefs.source_project);
+    if (retval) {
+        web_prefs_url = new wxString(wxEmptyString);
+    } else {
+        mf.init_buf_read(s.c_str());
+        XML_PARSER xp(&mf);
+        web_prefs.parse(xp, "", found_venue, mask);
+        web_prefs_url = new wxString(web_prefs.source_project);
+    }
     
     return local_prefs_found;
 }
diff --git a/clientgui/sg_DlgPreferences.h b/clientgui/sg_DlgPreferences.h
index 3b93a43..97805de 100644
--- a/clientgui/sg_DlgPreferences.h
+++ b/clientgui/sg_DlgPreferences.h
@@ -150,6 +150,8 @@ public:
     bool doesLocalPrefsFileExist();
     wxBitmap* GetBackgroundBmp() { return m_backgroundBitmap; }
 
+    bool OKToShow() { return m_bOKToShow; }
+
 private:
 ////@begin CPanelPreferences member variables
     wxCheckBox* m_chkProcOnBatteries;
@@ -170,6 +172,8 @@ private:
     wxString *web_prefs_url;
  
     wxBitmap* m_backgroundBitmap;
+    
+    bool m_bOKToShow;
    
 ////@end CPanelPreferences member variables
     GLOBAL_PREFS      global_preferences_working;
@@ -208,6 +212,8 @@ public:
 
     bool ConfirmClear();
 
+    bool OKToShow() { return m_pBackgroundPanel->OKToShow(); }
+
 private:
 ////@begin CDlgPreferences member variables
 
diff --git a/clientgui/sg_ProjectPanel.cpp b/clientgui/sg_ProjectPanel.cpp
index bc20f9b..d3ddf4d 100644
--- a/clientgui/sg_ProjectPanel.cpp
+++ b/clientgui/sg_ProjectPanel.cpp
@@ -314,16 +314,16 @@ void CSimpleProjectPanel::ReskinInterface() {
 }
 
 
-void CSimpleProjectPanel::OnAddProject(wxCommandEvent& /*event*/) {
+void CSimpleProjectPanel::OnAddProject(wxCommandEvent& event) {
     if (m_UsingAccountManager) {
         OnWizardUpdate();
     } else {
-        OnWizardAttach();
+        OnWizardAttach(event);
     }
 }
 
 
-void CSimpleProjectPanel::OnWizardAttach() {
+void CSimpleProjectPanel::OnWizardAttach(wxCommandEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CProjectsComponent::OnWizardAttach - Function Begin"));
 
     CMainDocument* pDoc = wxGetApp().GetDocument();
@@ -339,7 +339,7 @@ void CSimpleProjectPanel::OnWizardAttach() {
 
     pPanel->SetDlgOpen(true);
 
-    pPanel->OnProjectsAttachToProject();
+    pPanel->OnProjectsAttachToProject(event);
 //    btnAddProj->Refresh();
 
     pPanel->SetDlgOpen(false);
@@ -526,6 +526,7 @@ std::string CSimpleProjectPanel::GetProjectIconLoc(char* project_url) {
     char urlDirectory[256];
     CMainDocument* pDoc = wxGetApp().GetDocument();
     PROJECT* project = pDoc->state.lookup_project(project_url);
+    if (!project) return (std::string)"";
     url_to_project_dir(project->master_url, urlDirectory);
     return (std::string)urlDirectory + "/stat_icon";
 }
diff --git a/clientgui/sg_ProjectPanel.h b/clientgui/sg_ProjectPanel.h
index 517ecc5..251dae8 100644
--- a/clientgui/sg_ProjectPanel.h
+++ b/clientgui/sg_ProjectPanel.h
@@ -52,7 +52,7 @@ class CSimpleProjectPanel : public CSimplePanelBase
         void OnProjectSelection(wxCommandEvent &event);
         void OnProjectCommandButton(wxCommandEvent& /*event*/);
         void OnAddProject(wxCommandEvent& /*event*/);
-        void OnWizardAttach();
+        void OnWizardAttach(wxCommandEvent&);
         void OnWizardUpdate();
         void OnProjectWebSiteButton(wxCommandEvent& /*event*/);
         void UpdateProjectList();
diff --git a/configure.ac b/configure.ac
index 38b8dc3..79cd5d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,15 +6,15 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
 AC_PREREQ(2.58)
 
 dnl Set the BOINC version here.  You can also use the set-version script.
-AC_INIT(BOINC, 7.5.0)
+AC_INIT(BOINC, 7.6.2)
 AC_CONFIG_MACRO_DIR([m4])
 LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
 AC_SUBST([LIBBOINC_VERSION])
 
-WRAPPER_RELEASE=26013
+WRAPPER_RELEASE=26014
 AC_SUBST([WRAPPER_RELEASE])
 
-VBOXWRAPPER_RELEASE=26161
+VBOXWRAPPER_RELEASE=26167
 AC_SUBST([VBOXWRAPPER_RELEASE])
 
 AC_CANONICAL_TARGET
diff --git a/db/boinc_db.cpp b/db/boinc_db.cpp
index 4e3cfea..5542f27 100644
--- a/db/boinc_db.cpp
+++ b/db/boinc_db.cpp
@@ -1750,15 +1750,27 @@ int DB_VALIDATOR_ITEM_SET::enumerate(
 ) {
     int retval;
     char query[MAX_QUERY_LEN], mod_clause[256];
+    char main_clause[256];
     MYSQL_ROW row;
     VALIDATOR_ITEM new_item;
 
     if (!cursor.active) {
+        sprintf(main_clause,
+            " and wu.appid = %d and wu.need_validate > 0 ", appid
+        );
         if (wu_id_modulus) {
-            sprintf(mod_clause,
-                " and wu.id %% %d = %d ",
-                wu_id_modulus, wu_id_remainder
-            );
+            // terrible kludge: if rem >= mod, treat it as a WU ID
+            // This is to support the --wu_id debugging feature
+            //
+            if (wu_id_remainder < wu_id_modulus) {
+                sprintf(mod_clause,
+                    " and wu.id %% %d = %d ",
+                    wu_id_modulus, wu_id_remainder
+                );
+            } else {
+                sprintf(mod_clause, " and wu.id = %u ", wu_id_remainder);
+                strcpy(main_clause, "");
+            }
         } else {
             strcpy(mod_clause, "");
         }
@@ -1812,10 +1824,10 @@ int DB_VALIDATOR_ITEM_SET::enumerate(
             "   res.runtime_outlier "
             "FROM "
             "   workunit AS wu, result AS res where wu.id = res.workunitid "
-            "   and wu.appid = %d and wu.need_validate > 0 %s "
+            "   %s %s "
             "LIMIT "
             "   %d ",
-            appid, mod_clause, nresult_limit
+            main_clause, mod_clause, nresult_limit
         );
 
         retval = db->do_query(query);
diff --git a/db/schema.sql b/db/schema.sql
index 9a38801..cc4dbcb 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -443,18 +443,18 @@ create table forum (
     orderID                 integer         not null,
     title                   varchar(254)    not null,
     description             varchar(254)    not null,
-    timestamp               integer         not null,
+    timestamp               integer         not null default 0,
         -- time of last new or modified thread or post
-    threads                 integer         not null,
+    threads                 integer         not null default 0,
         -- number of non-hidden threads in forum
-    posts                   integer         not null,
-    rate_min_expavg_credit  integer         not null,
-    rate_min_total_credit   integer         not null,
-    post_min_interval       integer         not null,
-    post_min_expavg_credit  integer         not null,
-    post_min_total_credit   integer         not null,
+    posts                   integer         not null default 0,
+    rate_min_expavg_credit  integer         not null default 0,
+    rate_min_total_credit   integer         not null default 0,
+    post_min_interval       integer         not null default 0,
+    post_min_expavg_credit  integer         not null default 0,
+    post_min_total_credit   integer         not null default 0,
     is_dev_blog             tinyint         not null default 0,
-    parent_type             integer         not null,
+    parent_type             integer         not null default 0,
         -- entity type to which this forum is attached:
         -- 0 == category (public)
         -- 1 == team
diff --git a/doc/email_lists.php b/doc/email_lists.php
index 9de93f7..861698c 100644
--- a/doc/email_lists.php
+++ b/doc/email_lists.php
@@ -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>",
@@ -65,22 +65,6 @@ list_item("<a href=http://groups.google.com/group/boinc-team-founders>BOINC team
 );
 list_end();
 
-echo "
-<h2>Problems with email lists</h2>
-<p>
-Dec 2 2005: some people are reporting that their postings
-to these email lists never appear.
-Here's a reply from our system administrator:
-<blockquote>
-My first guess is that the barracuda antispam system is matching their email address or email sending server to a DNSBL (blacklist) and dropping the message. We use several popular DNSBL's to either block or tag blatant spam (spamcop, spamhaus, etc.) The lists we use are usually pretty good at only listing blatant spammers, but sometimes valid addresses are listed for short periods until they can get delisted. This typically happens when a spammer is using an ISP with DHCP addresses -- t [...]
-
-<p>
-We could disable antispam filtering on your lists, but I wouldn't advise it as you'd get a lot more of spam. For instance, according to my count for the period 11/13 - 12/1, boinc_alpha list got around 58 valid messages, while the antispam system blocked another 85 messages. It's your call.
-
-</blockquote>
-
-";
-
 page_tail();
 
 ?>
diff --git a/doc/projects.inc b/doc/projects.inc
index 25f0182..95fe21a 100644
--- a/doc/projects.inc
+++ b/doc/projects.inc
@@ -82,6 +82,16 @@ $biomed = array(
     tra("Biology and Medicine"),
     array(
         array(
+            "DENIS at Home",
+            "http://denis.usj.es/denisathome/",
+            "San Jorge University, Zaragoza, Spain",
+            "Medical physiology",
+            "DENIS at Home does cardiac electrophysiological simulations, studying the electrical activity of the heart.",
+            "",
+            "",
+            "Study the physiology of the heart"
+        ),
+        array(
             "RNA World",
             "http://www.rnaworld.de/rnaworld/",
             "Rechenkraft.net e.V.",
@@ -312,6 +322,16 @@ $astro_phys_chem = array(
             "Study the evolution of the Universe"
         ),
         array(
+            "Universe at Home",
+            "universeathome.pl/universe/",
+            "University of Warsaw",
+            tra("Astronomy"),
+            "Universe at Home aims to create the first database of the simulated stellar content of the Universe, from the earliest stars to the most exotic black hole binaries.",
+            "universe_at_home.png",
+            "",
+            "Do research in physics and astronomy"
+        ),
+        array(
             "Milkyway at home",
             "http://milkyway.cs.rpi.edu/milkyway/",
             tra("Rensselaer Polytechnic Institute"),
diff --git a/doc/white.css b/doc/white.css
index 0a57fca..739a9e0 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/html/inc/forum.inc b/html/inc/forum.inc
index ba49c0b..cd29472 100644
--- a/html/inc/forum.inc
+++ b/html/inc/forum.inc
@@ -98,14 +98,17 @@ define('S_TESTER', 3);
 define('S_VOLUNTEER', 4);
 define('S_VOLUNTEER_TESTER', 5);
 define('S_SCIENTIST', 6);
-
-$special_user_bitfield[S_MODERATOR]="Volunteer moderator";
-$special_user_bitfield[S_ADMIN]="Project administrator";
-$special_user_bitfield[S_DEV]="Project developer";
-$special_user_bitfield[S_TESTER]="Project tester";
-$special_user_bitfield[S_VOLUNTEER]="Volunteer developer";
-$special_user_bitfield[S_VOLUNTEER_TESTER]="Volunteer tester";
-$special_user_bitfield[S_SCIENTIST]="Project scientist";
+define('S_HELP_DESK_EXPERT', 7);
+define('S_NFLAGS', 8);
+
+$special_user_bitfield[S_MODERATOR] = tra("Volunteer moderator");
+$special_user_bitfield[S_ADMIN] = tra("Project administrator");
+$special_user_bitfield[S_DEV] = tra("Project developer");
+$special_user_bitfield[S_TESTER] = tra("Project tester");
+$special_user_bitfield[S_VOLUNTEER] = tra("Volunteer developer");
+$special_user_bitfield[S_VOLUNTEER_TESTER] = tra("Volunteer tester");
+$special_user_bitfield[S_SCIENTIST] = tra("Project scientist");
+$special_user_bitfield[S_HELP_DESK_EXPERT] = tra("Help desk expert");
 
 // show a banner with search form on left and PM info on right
 //
@@ -666,7 +669,7 @@ function show_post(
         $posttext = output_transform($posttext, $options);
         
         echo "<p>", $posttext, "</p>";
-        echo "</td></tr><tr><td class=\"postfooter\">ID: <i>", $post->id;
+        echo "</td></tr><tr><td class=\"postfooter\"><span>ID: <i>", $post->id;
         if ($no_forum_rating) {
             echo " · <a href=\"forum_report_post.php?post=".$post->id."\">";
             show_image(REPORT_POST_IMAGE, tra("Report this post as offensive"), tra("Report as offensive"), REPORT_POST_IMAGE_HEIGHT);
@@ -690,7 +693,7 @@ function show_post(
             $url = "forum_reply.php?thread=" . $thread->id . "&post=" . $post->id . "#input";
             show_button($url, tra("Quote"), tra("Post a reply by quoting this message"));
         }
-        echo "</td></tr>";
+        echo "</span></td></tr>";
     } else {
         echo "</td></tr><tr><td class=\"postfooter\">";
     }
diff --git a/html/inc/forum_db.inc b/html/inc/forum_db.inc
index 98bebb3..8488763 100644
--- a/html/inc/forum_db.inc
+++ b/html/inc/forum_db.inc
@@ -150,7 +150,7 @@ class BoincForumPrefs {
         } else {
             $prefs = self::lookup_userid($user->id);
             if (!$prefs) {
-                self::insert("(userid, thread_sorting, pm_notification) values ($user->id, 8, 0)");
+                self::insert("(userid, last_post, forum_sorting, thread_sorting, rated_posts, ignorelist, pm_notification) values ($user->id, 0, 0, 8, '', '', 0)");
                 $prefs = self::lookup_userid($user->id);
                 $prefs->userid = $user->id;
                 $prefs->thread_sorting = 6;
diff --git a/html/inc/forum_email.inc b/html/inc/forum_email.inc
index f36288c..0bd6d4b 100644
--- a/html/inc/forum_email.inc
+++ b/html/inc/forum_email.inc
@@ -60,7 +60,7 @@ function mail_report_list($forum, $subject, $body, $must_send=false) {
 //////////////////// post hidden/unhidden ///////////
 //
 function send_moderation_email($forum, $post, $thread, $explanation, $action) {
-    global $master_url;
+    $master_url = parse_config(get_config(), "<master_url>");
     $moderator=get_logged_in_user();
     $body = "";
     $user = BoincUser::lookup_id($post->user);
@@ -98,7 +98,7 @@ $body
 function send_thread_moderation_email(
     $forum, $thread, $message, $action_name, $explanation
 ) {
-    global $master_url;
+    $master_url = parse_config(get_config(), "<master_url>");
     $moderator = get_logged_in_user();
     $user = BoincUser::lookup_id($thread->owner);
     $body = "";
@@ -139,7 +139,7 @@ Do not reply to this message.
 //////////////////// a user clicks the red "x" to report a post ///////////
 //
 function send_report_post_email($user, $forum, $thread,  $post, $message) {
-    global $master_url;
+	$master_url = parse_config(get_config(), "<master_url>");
     $body = "";
     $owner = BoincUser::lookup_id($post->user);
 
@@ -194,7 +194,7 @@ because your postings have not followed our guidelines.
 //////////////////// a banishment vote has been started  ///////////
 //
 function send_banish_vote_email($user, $duration, $reason, $end_time) {
-    global $master_url;
+	$master_url = parse_config(get_config(), "<master_url>");
     $now=time();
     $subject = PROJECT." banishment vote underway";
     $vote_url = $master_url."forum_banishment_vote.php";
diff --git a/html/inc/stats_sites.inc b/html/inc/stats_sites.inc
index b1ed52b..80ac93f 100644
--- a/html/inc/stats_sites.inc
+++ b/html/inc/stats_sites.inc
@@ -35,7 +35,7 @@ $cpid_stats_sites = array(
         "http://boinc.netsoft-online.com/e107_plugins/boinc/get_user.php?cpid=%s&html=1"
     ),
     array("The Knights Who Say 'Ni!'",
-        "http://stats.kwsn.net/user.php?proj=all&cpid=%s"
+        "http://stats.kwsn.info/user.php?proj=all&cpid=%s"
     ),
 );
 
@@ -81,7 +81,7 @@ $stats_sites = array(
         "SETI at Netherlands stats page",
         ""
     ),
-    array("http://stats.kwsn.net/",
+    array("http://stats.kwsn.info/",
         "The Knights Who Say 'Ni' stats",
         ""
     ),
diff --git a/html/inc/user.inc b/html/inc/user.inc
index ca5d23f..b1aa020 100644
--- a/html/inc/user.inc
+++ b/html/inc/user.inc
@@ -559,7 +559,7 @@ function make_user(
     $country = BoincDb::escape_string($country);
     $postal_code = sanitize_tags(BoincDb::escape_string($postal_code));
 
-    $uid = BoincUser::insert("(create_time, email_addr, name, authenticator, country, postal_code, total_credit, expavg_credit, expavg_time, project_prefs, teamid,  send_email, show_hosts, cross_project_id, passwd_hash) values($now, '$email_addr', '$name', '$authenticator', '$country', '$postal_code', 0, 0, unix_timestamp(), '$project_prefs', $teamid, 1, 1, '$cross_project_id', '$passwd_hash')");
+    $uid = BoincUser::insert("(create_time, email_addr, name, authenticator, country, postal_code, total_credit, expavg_credit, expavg_time, project_prefs, teamid,  venue, send_email, show_hosts, posts, seti_id, seti_nresults, seti_last_result_time, seti_total_cpu, has_profile, cross_project_id, passwd_hash, email_validated, donated) values($now, '$email_addr', '$name', '$authenticator', '$country', '$postal_code', 0, 0, unix_timestamp(), '$project_prefs', $teamid, '', 1, 1, 0, 0, 0, 0,  [...]
 
     if (!$uid) {
         return null;
diff --git a/html/ops/db_update.php b/html/ops/db_update.php
index 9a5ef35..7f12e11 100644
--- a/html/ops/db_update.php
+++ b/html/ops/db_update.php
@@ -975,6 +975,20 @@ function update_10_8_2014() {
     do_query("alter table user_submit_app add primary key(user_id, app_id)");
 }
 
+function update_4_15_2015() {
+    do_query("alter table forum
+        alter timestamp set default 0,
+        alter threads set default 0,
+        alter posts set default 0,
+        alter rate_min_expavg_credit set default 0,
+        alter rate_min_total_credit set default 0,
+        alter post_min_interval set default 0,
+        alter post_min_expavg_credit set default 0,
+        alter post_min_total_credit set default 0,
+        alter parent_type set default 0
+    ");
+}
+
 // Updates are done automatically if you use "upgrade".
 //
 // If you need to do updates manually,
@@ -1019,6 +1033,7 @@ $db_updates = array (
     array(27010, "update_6_5_2014"),
     array(27011, "update_8_15_2014"),
     array(27012, "update_10_8_2014"),
+    array(27013, "update_4_15_2015"),
 );
 
 ?>
diff --git a/html/ops/dbinfo.php b/html/ops/dbinfo.php
index a336d1e..2949f31 100644
--- a/html/ops/dbinfo.php
+++ b/html/ops/dbinfo.php
@@ -25,7 +25,7 @@ class DB_REC {
 }
 
 
-$db_name = parse_config($config, "<db_name>");
+$db_name = parse_config(get_config(), "<db_name>");
 
 db_init();
 
diff --git a/html/ops/error_summary.php b/html/ops/error_summary.php
index 5aee8d4..fefe0ce 100644
--- a/html/ops/error_summary.php
+++ b/html/ops/error_summary.php
@@ -22,6 +22,11 @@
 require_once("../inc/util.inc");
 require_once("../inc/result.inc");
 
+$ncodes = get_int('ncodes', true);
+if (!$ncodes) $ncodes = 10;
+$nresults_per_code = get_int('nresults_per_code', true);
+if (!$nresults_per_code) $nresults_per_code = 10;
+
 function compare ($x, $y) {
     return $x->count < $y->count;
 }
@@ -38,7 +43,7 @@ foreach ($results as $r) {
         $error_codes[$e] = $x;
     } else {
         $x = new StdClass;
-        $x->count = 0;
+        $x->count = 1;
         $x->results = array($r);
         $error_codes[$e] = $x;
     }
@@ -49,13 +54,13 @@ uasort($error_codes, 'compare');
 page_head("Error summary");
 $i = 0;
 foreach ($error_codes as $code => $x) {
-    if ($i++ > 10) break;
-    echo "<br><br>Exit status".exit_status_string($code)." ($x->count results)\n";
+    if ($i++ >= $ncodes) break;
+    echo "<h2>Exit status: ".exit_status_string($code)." ($x->count results)</h2>\n";
     $results = $x->results;
     $j = 0;
     foreach ($results as $r) {
-        if ($j++ > 10) break;
-        echo "<br>   <a href=result.php?resultid=$r->id>$r->id</a>\n";
+        if ($j++ >= $nresults_per_code) break;
+        echo " <a href=".URL_BASE."result.php?resultid=$r->id>$r->id</a><br>\n";
     }
 }
 page_tail();
diff --git a/html/ops/grant_credit.php b/html/ops/grant_credit.php
index 5f532e3..7911601 100644
--- a/html/ops/grant_credit.php
+++ b/html/ops/grant_credit.php
@@ -16,6 +16,9 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+// DEPRECATED - WON'T WORK.
+// result.claimed_credit is not used any more
+
 // Award credit to users/hosts/teams for WU which have been
 // cancelled or have otherwise failed (error_mask != 0).
 // Credit granted is credit claimed, with a hardwired limit of 300 units.
diff --git a/html/ops/manage_special_users.php b/html/ops/manage_special_users.php
index 2852907..b915ebc 100644
--- a/html/ops/manage_special_users.php
+++ b/html/ops/manage_special_users.php
@@ -27,7 +27,7 @@ start_table("align=\"center\"");
 row1("Current special users", '9');
 
 echo "<tr><td>User</td>";
-for ($i=0;$i<=6;$i++) {
+for ($i=0; $i<S_NFLAGS; $i++) {
     echo "<td width=\"15\">" . $special_user_bitfield[$i] . "</td>\n";
 }
 echo "</tr>";
@@ -43,7 +43,7 @@ for ($i=1; $i<=_mysql_num_rows($result); $i++){
     echo "<input type=\"hidden\" name=\"userid\" value=\"$foo->userid\"
         <tr><td>$foo->name ($foo->id)</td>
     ";
-    for ($j=0; $j<=6; $j++) {
+    for ($j=0; $j<S_NFLAGS; $j++) {
         $bit = substr($foo->special_user, $j, 1);
         echo "<td><input type=\"checkbox\" name=\"role".$j."\" value=\"1\"";
         if ($bit == 1) {
@@ -58,7 +58,7 @@ for ($i=1; $i<=_mysql_num_rows($result); $i++){
 echo "<tr><form action=\"manage_special_users_action.php\" method=\"POST\">\n";
 echo "<td>Add UserID:<input type=\"text\" name=\"userid\" size=\"6\"></td>";
 
-for ($j=0;$j<=6;$j++) {
+for ($j=0; $j<S_NFLAGS; $j++) {
     echo "<td><input type=\"checkbox\" name=\"role".$j."\" value=\"1\"";
     echo "></td>\n";
 }
diff --git a/html/ops/manage_special_users_action.php b/html/ops/manage_special_users_action.php
index dd196f3..10c4244 100644
--- a/html/ops/manage_special_users_action.php
+++ b/html/ops/manage_special_users_action.php
@@ -25,7 +25,7 @@ admin_page_head("Manage special users action");
 
 $bitset = '';
 
-for ($i=0;$i<=6;$i++) {
+for ($i=0;$i<S_NFLAGS;$i++) {
     if (post_int("role".$i, TRUE) == '1') {
         $bitset = str_pad($bitset, $i+1, '1');
     } else {
diff --git a/html/ops/size_census.php b/html/ops/size_census.php
index 42f7371..f593903 100755
--- a/html/ops/size_census.php
+++ b/html/ops/size_census.php
@@ -30,7 +30,7 @@ error_reporting(E_ALL);
 ini_set('display_errors', true);
 ini_set('display_startup_errors', true);
 
-require_once("../inc/boinc_db.inc");
+require_once("../inc/util.inc");
 
 function do_app($app) {
     // enumerate the host_app_versions for this app,
@@ -41,7 +41,7 @@ function do_app($app) {
         " from DBNAME.host_app_version, DBNAME.host, DBNAME.app_version " .
         " where host_app_version.app_version_id = app_version.id " .
         " and app_version.appid = $app->id " .
-        " and et_n > 0 " .
+        " and et_n > 0  and et_avg > 0 " .
         " and host.id = host_app_version.host_id";
     $result = $db->do_query($query);
     $a = array();
@@ -69,6 +69,8 @@ function do_app($app) {
     fclose($f);
 }
 
+echo "Starting: ", time_str(time()), "\n";
+
 if ($argc == 2 && $argv[1]=="--all_apps") {
     $apps = BoincApp::enum("deprecated=0");
 } else {
@@ -78,5 +80,6 @@ if ($argc == 2 && $argv[1]=="--all_apps") {
 foreach ($apps as $app) {
     do_app($app);
 }
+echo "Finished: ", time_str(time()), "\n";
 
 ?>
diff --git a/html/user/create_profile.php b/html/user/create_profile.php
index 9c5f4c2..5cdb766 100644
--- a/html/user/create_profile.php
+++ b/html/user/create_profile.php
@@ -249,10 +249,10 @@ function process_create_profile($user, $profile) {
         $profile->verification = 0;
     }
 
-    $profile ? $hasPicture = $profile->has_picture: $hasPicture = false;
+    $profile ? $has_picture = $profile->has_picture: $has_picture = false;
 
     if (is_uploaded_file($_FILES['picture']['tmp_name'])) {
-        $hasPicture = true;
+        $has_picture = true;
         if ($profile) $profile->verification = 0;
 
         // echo "<br>Name: " . $_FILES['picture']['name'];
@@ -269,24 +269,30 @@ function process_create_profile($user, $profile) {
     }
     $response1 = sanitize_html($response1);
     $response2 = sanitize_html($response2);
+
+    $has_picture = $has_picture?1:0;
     if ($profile) {
         $query = " response1 = '".BoincDb::escape_string($response1)."',"
             ." response2 = '".BoincDb::escape_string($response2)."',"
             ." language = '".BoincDb::escape_string($language)."',"
-            ." has_picture = '$hasPicture',"
-            ." verification = '$profile->verification'"
-            ." WHERE userid = '$user->id'";
+            ." has_picture = $has_picture,"
+            ." verification = $profile->verification"
+            ." WHERE userid = $user->id";
         $result = BoincProfile::update_aux($query);
         if (!$result) {
             error_page(tra("Could not update the profile: database error"));
         }
     } else {
         $query = 'SET '
-            ." userid = '$user->id',"
+            ." userid=$user->id,"
             ." language = '".BoincDb::escape_string($language)."',"
             ." response1 = '".BoincDb::escape_string($response1)."',"
             ." response2 = '".BoincDb::escape_string($response2)."',"
-            ." has_picture = '$hasPicture',"
+            ." has_picture = $has_picture,"
+            ." recommend=0, "
+            ." reject=0, "
+            ." posts=0, "
+            ." uotd_time=0, "
             ." verification=0";
         $result = BoincProfile::insert($query);
         if (!$result) {
@@ -299,7 +305,9 @@ function process_create_profile($user, $profile) {
 
     echo tra("Congratulations! Your profile was successfully entered into our database.")
         ."<br><br>"
-        .tra("%1View your profile%2", "<a href=\"view_profile.php?userid=".$user->id."\">", "</a><br>")
+        ."<a href=\"view_profile.php?userid=".$user->id."\">"
+        .tra("View your profile")
+        ."</a><br>"
     ;
     page_tail();
 }
diff --git a/html/user/forum_report_post.php b/html/user/forum_report_post.php
index 2a7ea39..cd413a1 100644
--- a/html/user/forum_report_post.php
+++ b/html/user/forum_report_post.php
@@ -61,7 +61,7 @@ if (get_str("submit",true)){
     }
 }
 
-$no_forum_rating = parse_bool($config, "no_forum_rating");
+$no_forum_rating = parse_bool(get_config(), "no_forum_rating");
 
 //__--------------- Display part
 if ($success_page==1) {
diff --git a/html/user/user_permissions.php b/html/user/user_permissions.php
new file mode 100644
index 0000000..b989f3a
--- /dev/null
+++ b/html/user/user_permissions.php
@@ -0,0 +1,117 @@
+<?php
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2015 University of California
+//
+// BOINC is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License
+// as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// BOINC is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+
+require_once('../inc/forum.inc');
+
+db_init();
+
+function user_permissions_form() {
+    global $special_user_bitfield;
+    page_head('Manage user privileges');
+
+    start_table();
+    row1("Current special users", 99);
+
+    echo "<tr><th>User</th>";
+    for ($i=0; $i<S_NFLAGS; $i++) {
+        echo "<th>" . $special_user_bitfield[$i] . "</th>\n";
+    }
+    echo "<th> </th></tr>";
+
+    $result = _mysql_query(
+        "SELECT prefs.userid, prefs.special_user, user.id, user.name 
+        FROM forum_preferences as prefs, user 
+        WHERE CONVERT(special_user, DECIMAL) > 0 and prefs.userid=user.id"
+    );
+    $i = 0;
+    while ($foo = _mysql_fetch_object($result)) {
+        echo "<tr class=row$i>
+            <td>$foo->name ($foo->id)</td>
+            <form action=\"user_permissions.php\" method=\"POST\">
+            <input type=\"hidden\" name=\"userid\" value=\"$foo->userid\">
+        ";
+        for ($j=0; $j<S_NFLAGS; $j++) {
+            $bit = substr($foo->special_user, $j, 1);
+            $c = ($bit == 1)?"checked":"";
+            echo "<td>
+                <input type=\"checkbox\" name=\"role".$j."\" value=\"1\" $c>
+                </td>
+            ";
+        }
+        echo "<td><input class=\"btn btn-default\" type=\"submit\" value=\"Update\"></td>";
+        echo "</form></tr>\n";
+        $i = 1 - $i;
+    }
+
+    echo "
+        <tr class=row$i>
+        <form action=\"user_permissions.php\" method=\"POST\">
+        <td>Add User ID:<input type=\"text\" name=\"userid\" size=\"6\"></td>
+    ";
+
+    for ($j=0; $j<S_NFLAGS; $j++) {
+        echo "<td>
+            <input type=\"checkbox\" name=\"role".$j."\" value=\"1\">
+            </td>
+        ";
+    }
+    echo "<td>
+        <input class=\"btn btn-default\" type=\"submit\" value=\"Update\">
+        </td>
+        </form>
+        </tr>
+    ";
+
+    end_table();
+
+    page_tail();
+}
+
+function user_permissions_action() {
+    $bitset = '';
+
+    for ($i=0; $i<S_NFLAGS; $i++) {
+        if (post_int("role".$i, TRUE) == 1) {
+            $bitset .= '1';
+            echo "<br> setting $i";
+        } else {
+            $bitset .= '0';
+        }
+    }
+    $userid = post_int("userid");
+
+    $query = "UPDATE forum_preferences SET special_user='$bitset' WHERE userid=$userid";
+    _mysql_query($query);
+
+    Header("Location: user_permissions.php");
+}
+
+$user = get_logged_in_user();
+BoincForumPrefs::lookup($user);
+if (!is_moderator($user, null)) {
+    error_page("no access");
+}
+
+if (post_int("userid", true)) {
+    user_permissions_action();
+} else {
+    user_permissions_form();
+}
+
+$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+?>
diff --git a/lib/common_defs.h b/lib/common_defs.h
index 92483ae..cd50472 100644
--- a/lib/common_defs.h
+++ b/lib/common_defs.h
@@ -42,8 +42,9 @@
     // restore permanent mode - used only in set_X_mode() GUI RPC
 
 // values of ACTIVE_TASK::scheduler_state and ACTIVE_TASK::next_scheduler_state
-// "SCHEDULED" is synonymous with "executing" except when CPU throttling
-// is in use.
+// "SCHEDULED" doesn't mean the task is actually running;
+// e.g. it won't be running if tasks are suspended or CPU throttling is in use
+//
 #define CPU_SCHED_UNINITIALIZED   0
 #define CPU_SCHED_PREEMPTED       1
 #define CPU_SCHED_SCHEDULED       2
diff --git a/lib/filesys.cpp b/lib/filesys.cpp
index 5f23ed3..6bcd0a8 100644
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
@@ -87,20 +87,22 @@ char boinc_failed_file[MAXPATHLEN];
 // routines for enumerating the entries in a directory
 
 int is_file(const char* path) {
-    struct stat sbuf;
 #ifdef _WIN32
-    int retval = stat(path, &sbuf);
+    struct __stat64 sbuf;
+    int retval = _stat64(path, &sbuf);
 #else
+    struct stat sbuf;
     int retval = lstat(path, &sbuf);
 #endif
     return (!retval && (((sbuf.st_mode) & S_IFMT) == S_IFREG));
 }
 
 int is_dir(const char* path) {
-    struct stat sbuf;
 #ifdef _WIN32
-    int retval = stat(path, &sbuf);
+    struct __stat64 sbuf;
+    int retval = _stat64(path, &sbuf);
 #else
+    struct stat sbuf;
     int retval = lstat(path, &sbuf);
 #endif
     return (!retval && (((sbuf.st_mode) & S_IFMT) == S_IFDIR));
@@ -149,7 +151,10 @@ DIRREF dir_open(const char* p) {
     return dirp;
 }
 
-// Scan through a directory and return the next file name in it
+// Scan through a directory and return:
+// 0 if an entry was found (the entry is returned in p)
+// ERR_NOT_FOUND if we reached the end of the directory
+// ERR_READDIR if some other error occurred
 //
 int dir_scan(char* p, DIRREF dirp, int p_len) {
 #ifdef _WIN32
@@ -175,9 +180,13 @@ int dir_scan(char* p, DIRREF dirp, int p_len) {
                 if (p) strlcpy(p, data.cFileName, p_len);
                 return 0;
             } else {
+                DWORD ret = GetLastError();
                 FindClose(dirp->handle);
                 dirp->handle = INVALID_HANDLE_VALUE;
-                return 1;
+                if (ret == ERROR_NO_MORE_FILES) {
+                    return ERR_NOT_FOUND;
+                }
+                return ERR_READDIR;
             }
         }
     }
@@ -190,7 +199,8 @@ int dir_scan(char* p, DIRREF dirp, int p_len) {
             if (p) strlcpy(p, dp->d_name, p_len);
             return 0;
         } else {
-            return ERR_READDIR;
+            if (errno) return ERR_READDIR;
+            return ERR_NOT_FOUND;
         }
     }
 #endif
@@ -501,8 +511,13 @@ FILE* boinc_fopen(const char* path, const char* mode) {
 
 
 int boinc_file_exists(const char* path) {
+#ifdef _WIN32
+    struct __stat64 buf;
+    if (_stat64(path, &buf)) {
+#else
     struct stat buf;
     if (stat(path, &buf)) {
+#endif
         return false;     // stat() returns zero on success
     }
     return true;
@@ -511,10 +526,11 @@ int boinc_file_exists(const char* path) {
 // same, but doesn't traverse symlinks
 //
 int boinc_file_or_symlink_exists(const char* path) {
-    struct stat buf;
 #ifdef _WIN32
-    if (stat(path, &buf)) {
+    struct __stat64 buf;
+    if (_stat64(path, &buf)) {
 #else
+    struct stat buf;
     if (lstat(path, &buf)) {
 #endif
         return false;     // stat() returns zero on success
@@ -525,7 +541,6 @@ int boinc_file_or_symlink_exists(const char* path) {
 // returns zero on success, nonzero if didn't touch file
 //
 int boinc_touch_file(const char *path) {
-
     if (boinc_file_exists(path)) {
         return 0;
     }
diff --git a/lib/gui_rpc_client.cpp b/lib/gui_rpc_client.cpp
index a6c2a15..10953d5 100644
--- a/lib/gui_rpc_client.cpp
+++ b/lib/gui_rpc_client.cpp
@@ -378,10 +378,13 @@ int RPC::parse_reply() {
     char buf[256], error_msg[256];
     int n;
     while (fin.fgets(buf, 256)) {
+        if (strstr(buf, "boinc_gui_rpc_reply>"))
+                continue;
         if (strstr(buf, "<success")) return 0;
         if (parse_int(buf, "<status>", n)) {
             return n;
         }
+        if (strstr(buf, "<unauthorized/>")) return ERR_AUTHENTICATOR;
         if (parse_str(buf, "<error>", error_msg, sizeof(error_msg))) {
             fprintf(stderr, "%s: GUI RPC error: %s\n",
                 time_to_string(dtime()), error_msg
diff --git a/lib/prefs.cpp b/lib/prefs.cpp
index 5d7be08..eb1a24f 100644
--- a/lib/prefs.cpp
+++ b/lib/prefs.cpp
@@ -185,6 +185,7 @@ bool TIME_PREFS::suspended(double now) {
 
 void WEEK_PREFS::set(int day, double start, double end) {
     if (day < 0 || day > 6) return;
+    if (start == end) return;
     days[day].present = true;
     days[day].start_hour = start;
     days[day].end_hour = end;
@@ -193,6 +194,7 @@ void WEEK_PREFS::set(int day, double start, double end) {
 
 void WEEK_PREFS::set(int day, TIME_SPAN* time) {
     if (day < 0 || day > 6) return;
+    if (time->start_hour == time->end_hour) return;
     days[day].present = true;
     days[day].start_hour = time->start_hour;
     days[day].end_hour = time->end_hour;
@@ -388,6 +390,12 @@ int GLOBAL_PREFS::parse_override(
         if (!xp.is_tag) continue;
         if (xp.match_tag("global_preferences")) continue;
         if (xp.match_tag("/global_preferences")) {
+            if (cpu_times.start_hour == cpu_times.end_hour) {
+                mask.start_hour = mask.end_hour = false;
+            }
+            if (net_times.start_hour == net_times.end_hour) {
+                mask.net_start_hour = mask.net_end_hour = false;
+            }
             return 0;
         }
         if (in_venue) {
@@ -566,10 +574,11 @@ int GLOBAL_PREFS::parse_override(
             mask.max_bytes_sec_down = true;
             continue;
         }
-        if (xp.parse_double("cpu_usage_limit", cpu_usage_limit)) {
-            if (cpu_usage_limit < 0) cpu_usage_limit = 0;
-            if (cpu_usage_limit > 100) cpu_usage_limit = 100;
-            mask.cpu_usage_limit = true;
+        if (xp.parse_double("cpu_usage_limit", dtemp)) {
+            if (dtemp > 0 && dtemp <= 100) {
+                cpu_usage_limit = dtemp;
+                mask.cpu_usage_limit = true;
+            }
             continue;
         }
         if (xp.parse_double("daily_xfer_limit_mb", dtemp)) {
diff --git a/lib/str_replace.h b/lib/str_replace.h
index 1f6f455..b9f77f5 100644
--- a/lib/str_replace.h
+++ b/lib/str_replace.h
@@ -46,9 +46,11 @@ inline int strcasecmp(const char* s1, const char* s2) {
     while (*s1 && *s2) {
         char c1 = tolower(*s1++);
         char c2 = tolower(*s2++);
-        if (c1 != c2) return 1;     // don't worry about +/-
+        if (c1 < c2) return -1;
+        if (c1 > c2) return 1;
     }
-    if (*s1 || *s2) return 1;
+    if (*s1) return 1;
+    if (*s2) return -1;
     return 0;
 }
 #endif
diff --git a/locale/ca/BOINC-Manager.mo b/locale/ca/BOINC-Manager.mo
index 0dd9de9..4312b78 100644
Binary files a/locale/ca/BOINC-Manager.mo and b/locale/ca/BOINC-Manager.mo differ
diff --git a/locale/ca/BOINC-Manager.po b/locale/ca/BOINC-Manager.po
index 53dbadf..27e508a 100644
--- a/locale/ca/BOINC-Manager.po
+++ b/locale/ca/BOINC-Manager.po
@@ -4,50 +4,60 @@
 # 
 # Translators:
 # amontero <amontero at tinet.org>, 2015
+# Xavier Mor-Mur <xavi.mormur at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-02 00:00-0800\n"
-"PO-Revision-Date: 2015-02-21 11:56+0000\n"
-"Last-Translator: amontero <amontero at tinet.org>\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-21 04:58+0000\n"
+"Last-Translator: Xavier Mor-Mur <xavi.mormur at gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/boinc/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: AccountInfoPage.cpp:387
+"X-Generator: Poedit 1.7.6\n"
+"X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\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\\msw\n"
+"X-Poedit-SearchPath-4: clientgui\\mac\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: clientgui/AccountInfoPage.cpp:361
 #, c-format
 msgid "Identify your account at %s"
 msgstr "Identifiqui el seu compte a %s"
 
-#: AccountInfoPage.cpp:393
+#: clientgui/AccountInfoPage.cpp:367
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
 msgstr "Si us plau, entri la informació del seu compte\n(per crear un compte, visiti la pàgina web del projecte)"
 
-#: AccountInfoPage.cpp:397
+#: clientgui/AccountInfoPage.cpp:371
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
 msgstr "Aquest projecte en aquests moments no accepta nous comptes.\nEl pot afegir només si ja disposa d'un compte."
 
-#: AccountInfoPage.cpp:401
+#: clientgui/AccountInfoPage.cpp:375
 msgid "Are you already running this project?"
 msgstr "Està executant ja aquest projecte?"
 
-#: AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
 msgstr "&No, usuari nou"
 
-#: AccountInfoPage.cpp:408
+#: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
 msgstr "&Sí, usuari ja existent"
 
-#: AccountInfoPage.cpp:413
+#: clientgui/AccountInfoPage.cpp:387
 msgid ""
 "We were not able to set up your account information\n"
 "automatically.\n"
@@ -57,467 +67,508 @@ msgid ""
 "password fields."
 msgstr "No podem actualitzar automàticament la informació\ndel seu compte.\n\nSi us plau, premi l'accés 'Obtenir informació d'inici de sessió'\nper saber el que ha de posar en els camps adreça de correu i\ncontrasenya."
 
-#: AccountInfoPage.cpp:416
+#: clientgui/AccountInfoPage.cpp:390
 msgid "Find login information"
 msgstr "Obtenir informació d'inici de sessió"
 
-#: AccountInfoPage.cpp:436 AccountInfoPage.cpp:641
+#: clientgui/AccountInfoPage.cpp:410 clientgui/AccountInfoPage.cpp:632
 msgid "&Password:"
 msgstr "&Contrasenya:"
 
-#: AccountInfoPage.cpp:443 AccountInfoPage.cpp:665
+#: clientgui/AccountInfoPage.cpp:417 clientgui/AccountInfoPage.cpp:656
 msgid "Choose a &password:"
 msgstr "Escolleixi una &contrasenya:"
 
-#: AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:420
 msgid "C&onfirm password:"
 msgstr "C&onfirmi la contrasenya:"
 
-#: AccountInfoPage.cpp:453
+#: clientgui/AccountInfoPage.cpp:427
 #, c-format
 msgid "Are you already running %s?"
 msgstr "Ja està executant %s?"
 
-#: AccountInfoPage.cpp:482
+#: clientgui/AccountInfoPage.cpp:456
 msgid "&Username:"
 msgstr "Nom de l'&usuari:"
 
-#: AccountInfoPage.cpp:508
+#: clientgui/AccountInfoPage.cpp:485
+msgid "&Email address or LDAP ID:"
+msgstr "&Adreça de correu electrònic o LDAP ID:"
+
+#: clientgui/AccountInfoPage.cpp:489
 msgid "&Email address:"
 msgstr "&Adreça de correu:"
 
-#: AccountInfoPage.cpp:515
+#: clientgui/AccountInfoPage.cpp:497
 #, c-format
 msgid "minimum length %d"
 msgstr "longitud mínima %d"
 
-#: AccountInfoPage.cpp:522
+#: clientgui/AccountInfoPage.cpp:504
 msgid "Forgot your password?"
 msgstr "Ha oblidat la contrasenya?"
 
-#: AccountInfoPage.cpp:529
+#: clientgui/AccountInfoPage.cpp:511
 msgid ""
 "If you have not yet registered with this account manager,\n"
 "please do so before proceeding.  Click on the link below\n"
 "to register or to retrieve a forgotten password."
 msgstr "Si encara no s'ha registrat en aquest administrador de comptes,\nsi us plau faci-ho abans de continuar.  Premi el següent accés per\nregistrar-se o recuperar la contrasenya que ha oblidat."
 
-#: AccountInfoPage.cpp:532
+#: clientgui/AccountInfoPage.cpp:514
 msgid "Account manager web site"
 msgstr "Pàgina web de l'administrador de comptes"
 
-#: AccountInfoPage.cpp:574 WelcomePage.cpp:348
+#: clientgui/AccountInfoPage.cpp:556
 msgid "Add project"
 msgstr "Afegir un projecte"
 
-#: AccountInfoPage.cpp:576
+#: clientgui/AccountInfoPage.cpp:558
 msgid "Update account manager"
 msgstr "Actualitzar el administrador de comptes"
 
-#: AccountInfoPage.cpp:578 WelcomePage.cpp:307 WelcomePage.cpp:321
+#: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
 msgstr "Utilitzar l'administrador de comptes"
 
-#: AccountInfoPage.cpp:585
+#: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
 msgstr "Si us plau introdueix un nom."
 
-#: AccountInfoPage.cpp:587
+#: clientgui/AccountInfoPage.cpp:569
 msgid "Please enter an email address."
 msgstr "Si us plau entra un compte de correu."
 
-#: AccountInfoPage.cpp:597
+#: clientgui/AccountInfoPage.cpp:579
 #, c-format
 msgid "Please enter a password of at least %d characters."
 msgstr "Si us plau, introdueix una contrasenya d'almenys %d caràcters."
 
-#: AccountInfoPage.cpp:607
+#: clientgui/AccountInfoPage.cpp:589
 msgid ""
 "The password and confirmation password do not match. Please type them again."
 msgstr "La contrasenya i la confirmació no son iguals. Si us plau entri-les de nou."
 
-#: AccountManagerInfoPage.cpp:272
+#: clientgui/AccountManagerInfoPage.cpp:270
 msgid "Choose an account manager"
 msgstr "Esculli un administrador de comptes"
 
-#: AccountManagerInfoPage.cpp:275
+#: clientgui/AccountManagerInfoPage.cpp:273
 msgid ""
 "To choose an account manager, click its name or \n"
 "type its URL below."
 msgstr "Per escollir un administrador de comptes, premi el seu nom o \nintrodueixi la seva URL a continuació."
 
-#: AccountManagerInfoPage.cpp:279
+#: clientgui/AccountManagerInfoPage.cpp:277
 msgid "Account manager details:"
 msgstr "Informació de l'administrador de comptes"
 
-#: AccountManagerInfoPage.cpp:283
+#: clientgui/AccountManagerInfoPage.cpp:281
 msgid "Account manager &URL:"
 msgstr "&URL del Administrador de Comptes:"
 
-#: AccountManagerInfoPage.cpp:287
+#: clientgui/AccountManagerInfoPage.cpp:285
 msgid "Open web page"
 msgstr "Pàgina web oberta"
 
-#: AccountManagerInfoPage.cpp:290
+#: clientgui/AccountManagerInfoPage.cpp:288
 msgid "Visit this account manager's web site"
 msgstr "Visita la pàgina web d'aquest administrador de comptes"
 
-#: AccountManagerProcessingPage.cpp:187 AccountManagerPropertiesPage.cpp:193
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
+#: clientgui/AccountManagerProcessingPage.cpp:186
+#: clientgui/AccountManagerPropertiesPage.cpp:192
 #, c-format
 msgid "Communicating with %s."
 msgstr "Establint comunicació amb %s."
 
-#: AccountManagerProcessingPage.cpp:194 AccountManagerPropertiesPage.cpp:200
+#: clientgui/AccountManagerProcessingPage.cpp:193
+#: clientgui/AccountManagerPropertiesPage.cpp:199
 msgid "Communicating with server."
 msgstr "Establint comunicació amb el servidor."
 
-#: AccountManagerProcessingPage.cpp:199 AccountManagerPropertiesPage.cpp:205
+#: clientgui/AccountManagerProcessingPage.cpp:198
+#: clientgui/AccountManagerPropertiesPage.cpp:204
 msgid "Please wait..."
 msgstr "Si us plau, esperi..."
 
-#: AccountManagerProcessingPage.cpp:326
+#: clientgui/AccountManagerProcessingPage.cpp:325
 msgid "An internal server error has occurred.\n"
 msgstr "Ha ocorregut un error intern del servidor.\n"
 
-#: AdvancedFrame.cpp:95
+#: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
 msgstr "Connectat"
 
-#: AdvancedFrame.cpp:103
+#: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: AdvancedFrame.cpp:322 sg_BoincSimpleFrame.cpp:119
+#: clientgui/AdvancedFrame.cpp:327
+#, c-format
+msgid "New %s window..."
+msgstr "Nova finestra %s..."
+
+#: clientgui/AdvancedFrame.cpp:331
+#, c-format
+msgid "Open another %s window"
+msgstr "Obert un altre finestra %s"
+
+#: clientgui/AdvancedFrame.cpp:342
+msgid "Select computer..."
+msgstr "Seleccioni un ordinador..."
+
+#: clientgui/AdvancedFrame.cpp:343
+msgid "Connect to a BOINC client on another computer"
+msgstr "Connectar a un altre client BOINC en un altre ordinador"
+
+#: clientgui/AdvancedFrame.cpp:347
+msgid "Shut down connected client..."
+msgstr "Aturar el client connectat..."
+
+#: clientgui/AdvancedFrame.cpp:348
+msgid "Shut down the currently connected BOINC client"
+msgstr "Aturar el client BOINC actualment connectat"
+
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
 #, c-format
 msgid "Close the %s window"
 msgstr "Tancar la finestra %s"
 
-#: AdvancedFrame.cpp:325 sg_BoincSimpleFrame.cpp:122
-msgid "&Close Window"
-msgstr "Tan&car la Finestra"
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
+msgid "&Close window"
+msgstr "Tan&car la finestra"
 
-#: AdvancedFrame.cpp:336 AdvancedFrame.cpp:343 AdvancedFrame.cpp:350
+#: 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 "Tancar %s"
 
-#: AdvancedFrame.cpp:371
+#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+msgid "Preferences..."
+msgstr "Preferències..."
+
+#: clientgui/AdvancedFrame.cpp:398
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Notícies\tCtrl+Shift+N"
 
-#: AdvancedFrame.cpp:372
-msgid "Display notices"
-msgstr "Mostra anuncis"
+#: clientgui/AdvancedFrame.cpp:399
+msgid "Show notices"
+msgstr "Mostra els avisos"
 
-#: AdvancedFrame.cpp:377
+#: clientgui/AdvancedFrame.cpp:404
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projectes\tCtrl+Shift+P"
 
-#: AdvancedFrame.cpp:378
-msgid "Display projects"
-msgstr "Mostrar els projectes"
+#: clientgui/AdvancedFrame.cpp:405
+msgid "Show projects"
+msgstr "Mostra els projectes"
 
-#: AdvancedFrame.cpp:383
+#: clientgui/AdvancedFrame.cpp:410
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Tasques\tCtrl+Shift+T"
 
-#: AdvancedFrame.cpp:384
-msgid "Display tasks"
-msgstr "Mostrar les tasques"
+#: clientgui/AdvancedFrame.cpp:411
+msgid "Show tasks"
+msgstr "Mostra les tasques"
 
-#: AdvancedFrame.cpp:389
+#: clientgui/AdvancedFrame.cpp:416
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "&Lliuraments\tCtrl+Shift+X"
 
-#: AdvancedFrame.cpp:390
-msgid "Display transfers"
+#: clientgui/AdvancedFrame.cpp:417
+msgid "Show file transfers"
 msgstr "Mostrar els lliuraments"
 
-#: AdvancedFrame.cpp:395
+#: clientgui/AdvancedFrame.cpp:422
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Estadístiques\tCtrl+Shift+S"
 
-#: AdvancedFrame.cpp:396
-msgid "Display statistics"
+#: clientgui/AdvancedFrame.cpp:423
+msgid "Show statistics"
 msgstr "Mostrar les estadístiques"
 
-#: AdvancedFrame.cpp:401
-msgid "&Disk usage\tCtrl+Shift+D"
-msgstr "Utilització de &Disc\t Ctrl+Shift+D"
+#: clientgui/AdvancedFrame.cpp:428
+msgid "&Disk\tCtrl+Shift+D"
+msgstr "&Disc\tCtrl+Shift+D"
 
-#: AdvancedFrame.cpp:402
-msgid "Display disk usage"
+#: clientgui/AdvancedFrame.cpp:429
+msgid "Show disk usage"
 msgstr "Mostrar la utilització de disc"
 
-#: AdvancedFrame.cpp:409
+#: clientgui/AdvancedFrame.cpp:436
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Vista senzilla...\t Ctrl+Shift+V"
 
-#: AdvancedFrame.cpp:410
-msgid "Display the simple graphical interface."
-msgstr "Mostrar la interfície gràfica senzilla."
+#: clientgui/AdvancedFrame.cpp:437
+msgid "Switch to the Simple View"
+msgstr "Canviar a la Vista Senzilla"
 
-#: AdvancedFrame.cpp:424
-msgid "&Add project or account manager..."
-msgstr "&Afegir un projecte o un administrador de comptes..."
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
+msgstr "&Afegir el projecte..."
 
-#: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Voluntariat per a tots o algun dels més de 30 projectes en moltes àrees de la ciència"
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "Afegir un projecte"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "&Utilitza l'administrador de comptes..."
+
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "Utilitza un administrador de comptes per controlar aquest ordinador."
 
-#: AdvancedFrame.cpp:429
+#: clientgui/AdvancedFrame.cpp:461
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronitzar amb %s"
 
-#: AdvancedFrame.cpp:433
+#: clientgui/AdvancedFrame.cpp:465
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Obtenir la configuració actual des de %s"
 
-#: AdvancedFrame.cpp:443
-msgid "&Add project..."
-msgstr "&Afegir el projecte..."
-
-#: AdvancedFrame.cpp:444
-msgid "Add a project"
-msgstr "Afegir un projecte"
-
-#: AdvancedFrame.cpp:447
+#: clientgui/AdvancedFrame.cpp:479
 #, c-format
 msgid "S&top using %s..."
 msgstr "A&turar la utilització de %s..."
 
-#: AdvancedFrame.cpp:453
+#: clientgui/AdvancedFrame.cpp:485
 msgid "Remove this computer from account manager control."
 msgstr "Eliminar aquest ordinador del administrador de comptes."
 
-#: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
-msgid "&Options..."
-msgstr "&Opcions..."
+#: clientgui/AdvancedFrame.cpp:491
+msgid "Run CPU &benchmarks"
+msgstr "Executar les proves de la CPU"
 
-#: AdvancedFrame.cpp:459 sg_BoincSimpleFrame.cpp:179
-msgid "Configure display options and proxy settings"
-msgstr "Configureu les opcions de visualització i la configuració de proxy"
+#: clientgui/AdvancedFrame.cpp:492
+msgid "Run tests that measure CPU speed"
+msgstr "Executar les proves que mesuren la velocitat de la CPU"
 
-#: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
-msgid "Computing &preferences..."
-msgstr "&Preferències de computació..."
+#: clientgui/AdvancedFrame.cpp:496
+msgid "Retry pending transfers"
+msgstr "Re-intenta els lliuraments pendents"
 
-#: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
-msgid "Configure computing preferences"
-msgstr "Configurar les preferències de computació"
+#: clientgui/AdvancedFrame.cpp:497
+msgid "Retry deferred file transfers and task requests"
+msgstr "Re-intentar el lliurament diferit d'arxius i la petició de tasques"
+
+#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "Registre d'Esdeveniments...\t Ctrl+Shift+E"
+
+#: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr "Mostrar els missatges de diagnòstic"
 
-#: AdvancedFrame.cpp:472
+#: clientgui/AdvancedFrame.cpp:511
 msgid "&Run always"
 msgstr "Executar &sempre"
 
-#: AdvancedFrame.cpp:473
+#: clientgui/AdvancedFrame.cpp:512
 msgid "Allow work regardless of preferences"
 msgstr "Permetre treballs tot i les preferències"
 
-#: AdvancedFrame.cpp:477
+#: clientgui/AdvancedFrame.cpp:516
 msgid "Run based on &preferences"
 msgstr "Executar segons les &preferències"
 
-#: AdvancedFrame.cpp:478
+#: clientgui/AdvancedFrame.cpp:517
 msgid "Allow work according to preferences"
 msgstr "Permetre treballs d'acord a les preferències"
 
-#: AdvancedFrame.cpp:482
+#: clientgui/AdvancedFrame.cpp:521
 msgid "&Suspend"
 msgstr "&Suspendre"
 
-#: AdvancedFrame.cpp:483
+#: clientgui/AdvancedFrame.cpp:522
 msgid "Stop work regardless of preferences"
 msgstr "Aturar les tasques tot i les preferències"
 
-#: AdvancedFrame.cpp:508
+#: clientgui/AdvancedFrame.cpp:547
 msgid "Use GPU always"
 msgstr "Utilitzeu sempre la GPU"
 
-#: AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:548
 msgid "Allow GPU work regardless of preferences"
 msgstr "Permetre treballar la GPU tot i les preferències"
 
-#: AdvancedFrame.cpp:513
+#: clientgui/AdvancedFrame.cpp:552
 msgid "Use GPU based on preferences"
 msgstr "Utilitzar la GPU basant-se en les preferències"
 
-#: AdvancedFrame.cpp:514
+#: clientgui/AdvancedFrame.cpp:553
 msgid "Allow GPU work according to preferences"
 msgstr "Permetre treballar la GPU d'acord a les preferències"
 
-#: AdvancedFrame.cpp:518
+#: clientgui/AdvancedFrame.cpp:557
 msgid "Suspend GPU"
 msgstr "Suspendre la GPU"
 
-#: AdvancedFrame.cpp:519
+#: clientgui/AdvancedFrame.cpp:558
 msgid "Stop GPU work regardless of preferences"
 msgstr "Aturar les tasques de la GPU tot i les preferències"
 
-#: AdvancedFrame.cpp:543
-msgid "Network activity always available"
-msgstr "Accés a la xarxa sempre disponible"
+#: clientgui/AdvancedFrame.cpp:582
+msgid "Network activity always allowed"
+msgstr "Permetre sempre l'activitat a la xarxa"
 
-#: AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:583
 msgid "Allow network activity regardless of preferences"
 msgstr "Permetre l'accés al xarxa tot i les preferències"
 
-#: AdvancedFrame.cpp:548
+#: clientgui/AdvancedFrame.cpp:587
 msgid "Network activity based on preferences"
 msgstr "Accés a la xarxa basat en les preferències"
 
-#: AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:588
 msgid "Allow network activity according to preferences"
 msgstr "Permetre l'accés a la xarxa d'acord a les preferències"
 
-#: AdvancedFrame.cpp:553
+#: clientgui/AdvancedFrame.cpp:592
 msgid "Network activity suspended"
 msgstr "Suspès l'accés a la xarxa"
 
-#: AdvancedFrame.cpp:554
+#: clientgui/AdvancedFrame.cpp:593
 msgid "Stop BOINC network activity"
 msgstr "Aturar l'accés de BOINC a la xarxa"
 
-#: AdvancedFrame.cpp:564
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "Connectar a un altre ordinador executant %s"
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
+msgid "Computing &preferences..."
+msgstr "&Preferències de computació..."
 
-#: AdvancedFrame.cpp:569
-msgid "Select computer..."
-msgstr "Seleccioni un ordinador..."
+#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
+msgid "Configure computing preferences"
+msgstr "Configurar les preferències de computació"
 
-#: AdvancedFrame.cpp:574
-msgid "Shut down connected client..."
-msgstr "Aturar el client connectat..."
+#: clientgui/AdvancedFrame.cpp:608
+msgid "Exclusive applications..."
+msgstr "Aplicacions exclusives..."
 
-#: AdvancedFrame.cpp:575
-msgid "Shut down the currently connected client"
-msgstr "Aturar el client actualment connectat"
+#: clientgui/AdvancedFrame.cpp:609
+msgid "Configure exclusive applications"
+msgstr "Configura les aplicacions exclusives"
 
-#: AdvancedFrame.cpp:579
-msgid "Run CPU &benchmarks"
-msgstr "Executar les proves de la CPU"
+#: clientgui/AdvancedFrame.cpp:614
+msgid "Select columns..."
+msgstr "Selecciona columnes..."
 
-#: AdvancedFrame.cpp:580
-msgid "Runs BOINC CPU benchmarks"
-msgstr "Executa les proves de la CPU de BOINC"
+#: clientgui/AdvancedFrame.cpp:615
+msgid "Select which columns to display"
+msgstr "Selecciona les columnes a mostrar"
 
-#: AdvancedFrame.cpp:584
-msgid "Do network communication"
-msgstr "Establir comunicació per xarxa"
+#: clientgui/AdvancedFrame.cpp:619
+msgid "Event Log options...\tCtrl+Shift+F"
+msgstr "Opcions del registre d'esdeveniments...\tCtrl+Shift+F"
 
-#: AdvancedFrame.cpp:585
-msgid "Do all pending network communication"
-msgstr "Executar les comunicacions pendents per xarxa"
+#: clientgui/AdvancedFrame.cpp:620
+msgid "Enable or disable various diagnostic messages"
+msgstr "Activar o desactivar missatges de diagnòstic"
 
-#: AdvancedFrame.cpp:589
+#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
+msgid "&Other options..."
+msgstr "Altres &opcions..."
+
+#: clientgui/AdvancedFrame.cpp:625
+msgid "Configure display options and network settings"
+msgstr "Configura les opcions de visualització i paràmetres de xarxa"
+
+#: clientgui/AdvancedFrame.cpp:630
 msgid "Read config files"
 msgstr "Llegiu els fitxers de configuració"
 
-#: AdvancedFrame.cpp:590
+#: clientgui/AdvancedFrame.cpp:631
 msgid ""
 "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Llegiu la informació de configuració a cc_config.xml i qualsevol arxiu app_config.xml"
 
-#: AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:635
 msgid "Read local prefs file"
 msgstr "Llegir el fitxer de preferències locals"
 
-#: AdvancedFrame.cpp:595
+#: clientgui/AdvancedFrame.cpp:636
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Llegir les preferències des de global_prefs_override.xml."
 
-#: AdvancedFrame.cpp:600
-#, c-format
-msgid "Launch another instance of %s..."
-msgstr "Inicieu una altra instància de %s..."
-
-#: AdvancedFrame.cpp:604
-#, c-format
-msgid "Launch another %s"
-msgstr "Iniciar un altre %s"
-
-#: AdvancedFrame.cpp:614
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Registre d'Esdeveniments...\t Ctrl+Shift+E"
-
-#: AdvancedFrame.cpp:615
-msgid "Display diagnostic messages."
-msgstr "Mostrar els missatges de diagnòstic."
-
-#: AdvancedFrame.cpp:625 sg_BoincSimpleFrame.cpp:188
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
 #, c-format
 msgid "%s &help"
 msgstr "&ajuda de %s"
 
-#: AdvancedFrame.cpp:631 sg_BoincSimpleFrame.cpp:194
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
 #, c-format
 msgid "Show information about %s"
 msgstr "Mostrar la informació de %s"
 
-#: AdvancedFrame.cpp:643
+#: clientgui/AdvancedFrame.cpp:658
 #, c-format
 msgid "&%s help"
 msgstr "ajuda de &%s"
 
-#: AdvancedFrame.cpp:649 sg_BoincSimpleFrame.cpp:212
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
 msgid "Show information about the %s"
 msgstr "Mostrar la informació de %s"
 
-#: AdvancedFrame.cpp:661 sg_BoincSimpleFrame.cpp:224
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
 #, c-format
 msgid "%s &web site"
 msgstr "pàgina &web de %s"
 
-#: AdvancedFrame.cpp:667 sg_BoincSimpleFrame.cpp:230
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Mostrar la informació de BOINC i %s"
 
-#: AdvancedFrame.cpp:679 BOINCTaskBar.cpp:530 sg_BoincSimpleFrame.cpp:242
+#: clientgui/AdvancedFrame.cpp:688 clientgui/BOINCTaskBar.cpp:544
+#: clientgui/sg_BoincSimpleFrame.cpp:262
 #, c-format
 msgid "&About %s..."
 msgstr "&A propòsit de %s..."
 
-#: AdvancedFrame.cpp:685 sg_BoincSimpleFrame.cpp:248
+#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
 msgid "Licensing and copyright information."
 msgstr "Informació de la llicència i copyright."
 
-#: AdvancedFrame.cpp:692 sg_BoincSimpleFrame.cpp:255
+#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
 msgid "&File"
 msgstr "&Fitxer"
 
-#: AdvancedFrame.cpp:696 sg_BoincSimpleFrame.cpp:259
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr "&Veure"
 
-#: AdvancedFrame.cpp:700 sg_BoincSimpleFrame.cpp:263
-msgid "&Tools"
-msgstr "&Utilitats"
-
-#: AdvancedFrame.cpp:704
+#: clientgui/AdvancedFrame.cpp:709
 msgid "&Activity"
 msgstr "&Activitat"
 
-#: AdvancedFrame.cpp:708
-msgid "A&dvanced"
-msgstr "&Avançat"
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
+msgid "&Options"
+msgstr "&Opcions"
 
-#: AdvancedFrame.cpp:712 DlgEventLog.cpp:332 sg_BoincSimpleFrame.cpp:267
-#: wizardex.cpp:374 wizardex.cpp:381
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
+msgid "&Tools"
+msgstr "&Utilitats"
+
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: AdvancedFrame.cpp:1199
+#: clientgui/AdvancedFrame.cpp:1235
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Deixi d'utilitzar %s"
 
-#: AdvancedFrame.cpp:1204
+#: clientgui/AdvancedFrame.cpp:1240
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -527,48 +578,48 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr "Si deixeu d'utilitzar %s,\nels vostres projectes continuaran,\nperò els haureu de administrar manualment.\n\nDesitja finalitzar la utilització de %s?"
 
-#: AdvancedFrame.cpp:1401
+#: clientgui/AdvancedFrame.cpp:1469
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Aturar el client actual..."
 
-#: AdvancedFrame.cpp:1410
+#: 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 aturarà el client connectat actiu\ni demanarà per connectar-vos a un altre servidor."
 
-#: AdvancedFrame.cpp:1745 DlgAbout.cpp:119
+#: clientgui/AdvancedFrame.cpp:1881 clientgui/DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: AdvancedFrame.cpp:1754
+#: clientgui/AdvancedFrame.cpp:1890
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s ha adjuntat satisfactòriament %s"
 
-#: AdvancedFrame.cpp:1893
+#: clientgui/AdvancedFrame.cpp:2026
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: AdvancedFrame.cpp:1897
+#: clientgui/AdvancedFrame.cpp:2030
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connectant a %s"
 
-#: AdvancedFrame.cpp:1900
+#: clientgui/AdvancedFrame.cpp:2033
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Connectat a %s (%s)"
 
-#: AlreadyExistsPage.cpp:184
+#: clientgui/AlreadyExistsPage.cpp:184
 msgid "Username already in use"
 msgstr "Aquest nom d'usuari ja està en ús"
 
-#: AlreadyExistsPage.cpp:187
+#: clientgui/AlreadyExistsPage.cpp:187
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -576,11 +627,11 @@ msgid ""
 "Please visit the project's web site and follow the instructions there."
 msgstr "Ja existeix un compte d'usuari amb aquest nom i te una\ncontrasenya diferent a la que ha introduït.\n\nSi us plau, visiti la pàgina web del projecte i segueixi les instruccions."
 
-#: AlreadyExistsPage.cpp:191
+#: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
 msgstr "L'adreça de correu ja està en ús"
 
-#: AlreadyExistsPage.cpp:194
+#: clientgui/AlreadyExistsPage.cpp:194
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -588,91 +639,93 @@ msgid ""
 "Please visit the project's web site and follow the instructions there."
 msgstr "Ja existeix un compte amb aquest correu i te una\ncontrasenya diferent a la que ha introduït.\n\nSi us plau, visiti la pàgina web del projecte i segueixi les instruccions."
 
-#: AsyncRPC.cpp:1031
+#: clientgui/AsyncRPC.cpp:1031
 msgid "Communicating with BOINC client.  Please wait ..."
 msgstr "Establint comunicació amb el client BOINC.  Esperi si us plau ..."
 
-#: AsyncRPC.cpp:1034
+#: clientgui/AsyncRPC.cpp:1034
 #, c-format
 msgid "&Quit %s"
 msgstr "&Sortir de %s"
 
-#: AsyncRPC.cpp:1036
+#: clientgui/AsyncRPC.cpp:1036
 #, c-format
 msgid "E&xit %s"
 msgstr "&Tancar %s"
 
-#: AsyncRPC.cpp:1040
+#: clientgui/AsyncRPC.cpp:1040
 #, c-format
 msgid "%s - Communication"
 msgstr "%s - Comunicació"
 
-#: AsyncRPC.cpp:1056 DlgAdvPreferencesBase.cpp:107 sg_DlgPreferences.cpp:433
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: BOINCBaseFrame.cpp:505
+#: clientgui/BOINCBaseFrame.cpp:512
 #, c-format
 msgid "%s - Connection Error"
 msgstr "%s - Error de connexió"
 
-#: BOINCBaseFrame.cpp:514
+#: 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."
 msgstr "Actualment no està autoritzat per administrar el client.\nSi us plau posi's en contacte amb l'administrador per afegir-lo al grup local 'boinc_users'."
 
-#: BOINCBaseFrame.cpp:523
+#: clientgui/BOINCBaseFrame.cpp:530
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
 msgstr "Ha fallat l'autorització en connectar amb el client en execució.\nAsseguri's d'iniciar aquest programa en el mateix directori que el client en execució."
 
-#: BOINCBaseFrame.cpp:525
+#: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
 msgstr "L'autorització ha fallat connectant amb el client en execució."
 
-#: BOINCBaseFrame.cpp:533
+#: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
 msgstr "La contrasenya proporcionada és incorrecte, si us plau intenti-ho de nou."
 
-#: BOINCBaseFrame.cpp:577
+#: clientgui/BOINCBaseFrame.cpp:584
 #, c-format
 msgid "%s - Connection Failed"
 msgstr "%s - Ha fallat la connexió"
 
-#: BOINCBaseFrame.cpp:586
+#: clientgui/BOINCBaseFrame.cpp:593
 #, c-format
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
 msgstr "%s no pot connectar amb el client %s.\nDesitja intentar connectar de nou?"
 
-#: BOINCBaseFrame.cpp:622
+#: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
 msgid "%s - Daemon Start Failed"
 msgstr "%s - Ha fallat l'inici del servei"
 
-#: BOINCBaseFrame.cpp:632
+#: clientgui/BOINCBaseFrame.cpp:639
 #, 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."
 msgstr "%s no capaç d'iniciar el client %s.\nSi us plau inicii el Panell de Control->Eines Administratives->Serveis i inicieu el servei BOINC."
 
-#: BOINCBaseFrame.cpp:638
+#: clientgui/BOINCBaseFrame.cpp:645
 #, c-format
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
 msgstr "%s no capaç d'iniciar el client %s.\nSi us plau inicii el servei i provi-ho de nou."
 
-#: BOINCBaseFrame.cpp:689
+#: clientgui/BOINCBaseFrame.cpp:696
 #, c-format
 msgid "%s - Connection Status"
 msgstr "%s - Estat de la connexió"
 
-#: BOINCBaseFrame.cpp:700
+#: clientgui/BOINCBaseFrame.cpp:707
 #, c-format
 msgid ""
 "%s is not currently connected to a %s client.\n"
@@ -680,67 +733,68 @@ msgid ""
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr "%s no està connectat a un client %s.\nSi us plau utilitzi la opció de menú 'Avançat\\Seleccioni un ordinador...' per connectar-lo amb el client %s.\nPer connectar amb el propi ordinador si us plau utilitzi 'localhost' com a nom d'ordinador."
 
-#: BOINCBaseView.cpp:779
+#. Create the web sites task group
+#: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Pàgines web del projecte"
 
-#: BOINCClientManager.cpp:575
+#: clientgui/BOINCClientManager.cpp:573
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Sortida inesperada"
 
-#: BOINCClientManager.cpp:585
+#: clientgui/BOINCClientManager.cpp:583
 #, c-format
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
 "Would you like to restart it again?"
 msgstr "El client %s ha finalitzat 3 vegades de forma inesparda en els darrers %d minuts.\nDesitja iniciar-lo un cop més?"
 
-#: BOINCDialupManager.cpp:61
+#: clientgui/BOINCDialupManager.cpp:61
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - Estat de la xarxa"
 
-#: BOINCDialupManager.cpp:241
+#: clientgui/BOINCDialupManager.cpp:241
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
 msgstr "%s necessita connectar a Internet.\nPot fer-ho ara?"
 
-#: BOINCDialupManager.cpp:254
+#: clientgui/BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s està connectant a Internet."
 
-#: BOINCDialupManager.cpp:303
+#: clientgui/BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s a connectat a Internet."
 
-#: BOINCDialupManager.cpp:331
+#: clientgui/BOINCDialupManager.cpp:331
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s no ha pogut connectar a Internet."
 
-#: BOINCDialupManager.cpp:372
+#: clientgui/BOINCDialupManager.cpp:372
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
 msgstr "%s ha detectat que està connectat a Internet.\nActualitzant tots els projectes i intentant de nou totes les transferències."
 
-#: BOINCDialupManager.cpp:417
+#: clientgui/BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s s'ha desconnectat d'Internet."
 
-#: BOINCDialupManager.cpp:433
+#: clientgui/BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s no ha pogut desconnectar-se d'Internet."
 
-#: BOINCGUIApp.cpp:339
+#: clientgui/BOINCGUIApp.cpp:597
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -753,796 +807,973 @@ msgid ""
 "     user group."
 msgstr "En aquests moment no te autorització per gestionar el client.\n\nPer executar %s amb aquest usuari, si us plau:\n  - reinstal·li %s i respongui \"Si\" a la pregunta sobre\n     usuaris no-administradors\n o\n  - contacti amb el seu administrador per afegir-lo al grup\n     d'usuaris 'boinc_master'."
 
-#: BOINCGUIApp.cpp:345
+#: clientgui/BOINCGUIApp.cpp:603
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr "Les propietats o permisos de %s no estan definides correctament; si us plau reinstal·li %s.\n(Codi d'error %d"
 
-#: BOINCGUIApp.cpp:351
+#: clientgui/BOINCGUIApp.cpp:609
 msgid " at "
 msgstr " a "
 
-#: BOINCGUIApp.cpp:354 MainDocument.cpp:2484 MainDocument.cpp:2534
-#: MainDocument.cpp:2554 ViewTransfers.cpp:803
+#: clientgui/BOINCGUIApp.cpp:612 clientgui/MainDocument.cpp:2494
+#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
 msgid ")"
 msgstr ")"
 
-#: BOINCGUIApp.cpp:384
+#: clientgui/BOINCGUIApp.cpp:642
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
 msgstr "Es necessari reiniciar l'ordinador per tal de que BOINC s'executi correctament.\nSi us plau reiniciï l'ordinador i provi-ho de nou."
 
-#: BOINCGUIApp.cpp:385 DlgAbout.cpp:153
+#: clientgui/BOINCGUIApp.cpp:643 clientgui/DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "Administrador BOINC"
 
-#: BOINCGUIApp.cpp:572
+#: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "El sistema ha iniciat automàticament l'Administrador BOINC"
 
-#: BOINCGUIApp.cpp:574
+#: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Iniciar BOINC de manera que només la icona de la barra de tasques sigui visible"
 
-#: BOINCGUIApp.cpp:576
+#: clientgui/BOINCGUIApp.cpp:908
 msgid "Directory containing the BOINC Client executable"
 msgstr "Directori que conté l'executable del Client BOINC"
 
-#: BOINCGUIApp.cpp:577
+#: clientgui/BOINCGUIApp.cpp:909
 msgid "BOINC data directory"
 msgstr "Directori de les dades de BOINC"
 
-#: BOINCGUIApp.cpp:579
+#: clientgui/BOINCGUIApp.cpp:911
 msgid "Host name or IP address"
 msgstr "Nom de host o adreça IP"
 
-#: BOINCGUIApp.cpp:580
+#: clientgui/BOINCGUIApp.cpp:912
 msgid "GUI RPC port number"
 msgstr "GUI RPC nombre de port"
 
-#: BOINCGUIApp.cpp:581
+#: clientgui/BOINCGUIApp.cpp:913
 msgid "Password"
 msgstr "Contrasenya"
 
-#: BOINCGUIApp.cpp:582
+#: clientgui/BOINCGUIApp.cpp:914
 msgid "Startup BOINC with these optional arguments"
 msgstr "Iniciar BOINC amb aquests arguments opcionals"
 
-#: BOINCGUIApp.cpp:583
+#: clientgui/BOINCGUIApp.cpp:915
 msgid "disable BOINC security users and permissions"
 msgstr "desactivar la seguretat d'usuaris i permisos BOINC"
 
-#: BOINCGUIApp.cpp:584
+#: clientgui/BOINCGUIApp.cpp:916
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "seleccioni el mode de depuració per activar els missatges d'error de l'administrador"
 
-#: BOINCGUIApp.cpp:585
+#: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "estan permeses diverses instàncies de BOINC Manager"
 
-#: BOINCGUIApp.cpp:587
+#: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "No s'utilitza: solució per l'informe d'error al XCode 4.2"
 
-#: BOINCGUIApp.cpp:814
+#. These are just special tags so deal with them in a special way
+#: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Detecció Automàtica)"
 
-#: BOINCGUIApp.cpp:815
+#: clientgui/BOINCGUIApp.cpp:1167
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: BOINCGUIApp.cpp:816
+#: clientgui/BOINCGUIApp.cpp:1168
 msgid "(User Defined)"
 msgstr "(Definit per l'Usuari)"
 
-#: BOINCTaskBar.cpp:508
+#: clientgui/BOINCTaskBar.cpp:522
 #, c-format
 msgid "Open %s Web..."
 msgstr "Obrir la pàgina web %s..."
 
-#: BOINCTaskBar.cpp:515
+#: clientgui/BOINCTaskBar.cpp:529
 #, c-format
 msgid "Open %s..."
 msgstr "Obrir %s..."
 
-#: BOINCTaskBar.cpp:522 BOINCTaskBar.cpp:619 BOINCTaskBar.cpp:627
+#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:634
+#: clientgui/BOINCTaskBar.cpp:639
 msgid "Snooze"
 msgstr "Becaina"
 
-#: BOINCTaskBar.cpp:524 BOINCTaskBar.cpp:646 BOINCTaskBar.cpp:654
+#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:658
 msgid "Snooze GPU"
 msgstr "Becaina de la GPU"
 
-#: BOINCTaskBar.cpp:542
+#: clientgui/BOINCTaskBar.cpp:556
 msgid "E&xit"
 msgstr "&Sortir"
 
-#: BOINCTaskBar.cpp:612 ViewProjects.cpp:718 ViewWork.cpp:795
-#: sg_BoincSimpleFrame.cpp:758 sg_ProjectCommandPopup.cpp:110
-#: sg_TaskCommandPopup.cpp:102
+#: 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 "Continuar"
 
-#: BOINCTaskBar.cpp:639
+#: clientgui/BOINCTaskBar.cpp:649
 msgid "Resume GPU"
 msgstr "Continuar GPU"
 
-#: BOINCTaskBar.cpp:713
+#: clientgui/BOINCTaskBar.cpp:715
 msgid "Computing is enabled"
 msgstr "La computació està habilitada"
 
-#: BOINCTaskBar.cpp:717
+#: clientgui/BOINCTaskBar.cpp:719
 msgid "Computing is suspended - "
 msgstr "La computació està suspesa - "
 
-#: BOINCTaskBar.cpp:727
+#: clientgui/BOINCTaskBar.cpp:729
 msgid "GPU computing is enabled"
 msgstr "La computació de la GPU està disponible"
 
-#: BOINCTaskBar.cpp:730
+#: clientgui/BOINCTaskBar.cpp:732
 msgid "GPU computing is suspended - "
 msgstr "La computació de la GPU està suspesa - "
 
-#: BOINCTaskBar.cpp:739
+#: clientgui/BOINCTaskBar.cpp:741
 msgid "Network is enabled"
 msgstr "La xarxa està activada"
 
-#: BOINCTaskBar.cpp:742
+#: clientgui/BOINCTaskBar.cpp:744
 msgid "Network is suspended - "
 msgstr "La xarxa està suspesa - "
 
-#: BOINCTaskBar.cpp:750
+#: clientgui/BOINCTaskBar.cpp:752
 msgid "Reconnecting to client."
 msgstr "Tornant a connectar amb el client."
 
-#: BOINCTaskBar.cpp:752
+#: clientgui/BOINCTaskBar.cpp:754
 msgid "Not connected to a client."
 msgstr "No connectat a cap client."
 
-#: BOINCTaskBar.cpp:805
+#: clientgui/BOINCTaskBar.cpp:807
 #, c-format
 msgid "%s Notices"
 msgstr "%s Notícies"
 
-#: BOINCTaskBar.cpp:811
+#: clientgui/BOINCTaskBar.cpp:813
 msgid "There are new notices - click to view."
 msgstr "Hi ha noves comunicacions - feu clic per veure-les."
 
-#: CompletionErrorPage.cpp:199
+#: clientgui/CompletionErrorPage.cpp:199
 msgid "Failed to add project"
 msgstr "No s'ha pogut afegir el projecte"
 
-#: CompletionErrorPage.cpp:204
+#: clientgui/CompletionErrorPage.cpp:204
 msgid "Failed to update account manager"
 msgstr "Ha fallat l'actualització de l'administrador de comptes"
 
-#: CompletionErrorPage.cpp:208
+#: clientgui/CompletionErrorPage.cpp:208
 msgid "Failed to remove account manager"
 msgstr "Ha fallat l'eliminació de l'administrador de comptes"
 
-#: CompletionErrorPage.cpp:212
+#: clientgui/CompletionErrorPage.cpp:212
 msgid "Failed to add account manager"
 msgstr "Ha fallat afegir l'administrador de comptes"
 
-#: CompletionErrorPage.cpp:221
+#: clientgui/CompletionErrorPage.cpp:221
 msgid ""
 "Please try again later.\n"
 "\n"
 "Click Finish to close."
 msgstr "Si us plau prova-ho més tard.\n\nPrem per tancar."
 
-#: CompletionErrorPage.cpp:225 CompletionPage.cpp:222 CompletionPage.cpp:242
-#: 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 "Premi Finalitzar per tancar."
 
-#: CompletionErrorPage.cpp:234
+#: clientgui/CompletionErrorPage.cpp:234
 msgid "Messages from server:"
 msgstr "Missatges del servidor:"
 
-#: CompletionPage.cpp:207
+#: clientgui/CompletionPage.cpp:207
 msgid "Project added"
 msgstr "Projecte afegit"
 
-#: CompletionPage.cpp:213
+#: clientgui/CompletionPage.cpp:213
 msgid "This project has been successfully added."
 msgstr "Aquest projecte ha estat afegit amb èxit."
 
-#: CompletionPage.cpp:218
+#: clientgui/CompletionPage.cpp:218
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
 msgstr "Quan premi Finalitzar, el seu navegador obrirà la pàgina on\npodrà establir el seu nom de compte i les preferències."
 
-#: CompletionPage.cpp:232
+#: clientgui/CompletionPage.cpp:232
 #, c-format
 msgid "Update from %s completed."
 msgstr "Actualització des de %s finalitzada."
 
-#: CompletionPage.cpp:236
+#: clientgui/CompletionPage.cpp:236
 msgid "Update completed."
 msgstr "Actualització finalitzada."
 
-#: CompletionPage.cpp:247
+#. Attach Completed
+#: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Ara està utilitzant el gestor de comptes"
 
-#: CompletionPage.cpp:252
+#: clientgui/CompletionPage.cpp:252
 #, c-format
 msgid "Welcome to %s!"
 msgstr "Benvingut a %s!"
 
-#: CompletionPage.cpp:263
+#: clientgui/CompletionPage.cpp:263
 #, c-format
 msgid "You are now using %s to manage accounts."
 msgstr "Està fent servir %s per administrar els comptes."
 
-#: CompletionPage.cpp:267
+#: clientgui/CompletionPage.cpp:267
 msgid "You are now using this account manager."
 msgstr "Ara està fent servir aquest administrador de comptes."
 
-#: DlgAbout.cpp:113 mac/Mac_GUI.cpp:96
+#: clientgui/DlgAbout.cpp:113
 #, c-format
 msgid "About %s"
 msgstr "Sobre %s"
 
-#: DlgAbout.cpp:172
+#: clientgui/DlgAbout.cpp:172
 msgid "Version:"
 msgstr "Versió:"
 
-#: DlgAbout.cpp:180
+#: clientgui/DlgAbout.cpp:180
 msgid "wxWidgets Version:"
 msgstr "Versió wxWidgets:"
 
-#: DlgAbout.cpp:188
+#: clientgui/DlgAbout.cpp:188
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: DlgAbout.cpp:192
+#: clientgui/DlgAbout.cpp:192
 msgid ""
-"(C) 2003-2013 University of California, Berkeley.\n"
+"(C) 2003-2015 University of California, Berkeley.\n"
 "All Rights Reserved."
-msgstr "(C) 2003-2013 Universitat de Califòrnia, Berkeley.\nTots els Drets Reservats."
+msgstr "(C) 2003-2015 Universitat de Califòrnia, Berkeley.\nTots els Drets Reservats."
+
+#: clientgui/DlgAbout.cpp:196
+msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
+msgstr "BOINC està sota la Llicència Pública General Lesser v3.0 de GNU."
 
-#: DlgAbout.cpp:196
-msgid "Berkeley Open Infrastructure for Network Computing"
-msgstr "Infraestructura Oberta de Berkeley per la Computació en xarxa"
+#: clientgui/DlgAbout.cpp:203
+msgid "For more information, visit "
+msgstr "Per a més informació, visita"
 
-#: DlgAbout.cpp:208 DlgExitMessage.cpp:173 DlgGenericMessage.cpp:120
-#: DlgOptions.cpp:396 DlgSelectComputer.cpp:163
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
+#: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: DlgAdvPreferences.cpp:544
-msgid "invalid number"
-msgstr "número incorrecte"
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
+msgid "Invalid number"
+msgstr "Número incorrecte"
+
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
+msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
+msgstr "Hora incorrecte, ha d'estar entre 0:00 i 24:00, el format es HH:MM"
 
-#: DlgAdvPreferences.cpp:545
-msgid "invalid time, format is HH:MM"
-msgstr "hora incorrecte, el format es HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:771
+msgid "Start time must be different from end time"
+msgstr "L'hora d'inici ha de ser diferent de la final"
 
-#: DlgAdvPreferences.cpp:546
-msgid "invalid time interval, format is HH:MM-HH:MM"
-msgstr "període de temps incorrecte, el format es HH:MM-HH:MM"
+#: clientgui/DlgAdvPreferences.cpp:685
+msgid "Number must be between 0 and 10"
+msgstr "El número ha d'estar entre 0 i 10"
 
-#: DlgAdvPreferences.cpp:751
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:772
+msgid "Number must be between 0 and 100"
+msgstr "El número ha d'estar entre 0 i 100"
+
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "detectat valor d'entrada incorrecte"
 
-#: DlgAdvPreferences.cpp:753
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 msgid "Validation Error"
 msgstr "Error de validació"
 
-#: DlgAdvPreferences.cpp:885 DlgAdvPreferences.cpp:891
-#: DlgAdvPreferences.cpp:897
-msgid "Applications to add"
-msgstr "Aplicacions per afegir"
-
-#: DlgAdvPreferences.cpp:914
-#, c-format
-msgid "'%s' is not an executable application."
-msgstr "'%s' no és una aplicació executable."
-
-#: DlgAdvPreferences.cpp:915 DlgAdvPreferences.cpp:962
-#: DlgAdvPreferences.cpp:986
-msgid "Add Exclusive App"
-msgstr "Afegeix l'aplicació exclusiva"
-
-#: DlgAdvPreferences.cpp:927
-msgid "Name of application to add?"
-msgstr "Nom de l'aplicació per afegir?"
+#: clientgui/DlgAdvPreferences.cpp:1158
+msgid "Discard local preferences and use web-based preferences?"
+msgstr "Ometre les preferències locals i utilitzar les preferències de la web?"
 
-#: DlgAdvPreferences.cpp:927
-msgid "Add exclusive app"
-msgstr "Afegir aplicació exclusiva"
-
-#: DlgAdvPreferences.cpp:961
-#, c-format
-msgid "Application names must end with '%s'"
-msgstr "Els noms d'aplicació han d'acabar amb '%s'"
+#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1171
+msgid "Confirmation"
+msgstr "Confirmació"
 
-#: DlgAdvPreferences.cpp:985
+#: clientgui/DlgAdvPreferencesBase.cpp:54
 #, c-format
-msgid "'%s' is already in the list."
-msgstr "'%s' ja està a la llista."
+msgid "%s - Computing preferences"
+msgstr "%s - Preferències de computació"
 
-#: DlgAdvPreferences.cpp:1077
+#: clientgui/DlgAdvPreferencesBase.cpp:82 clientgui/sg_DlgPreferences.cpp:161
 msgid ""
-"Do you really want to clear all local preferences?\n"
-"(This will not affect exclusive applications.)"
-msgstr "Do you really want to clear all local preferences?\n(Això no afectarà a les aplicacions exclusives.)"
+"Using local preferences.\n"
+"Click \"Use web prefs\" to use web-based preferences from"
+msgstr "Utilitzant les preferències locals.\nPrémer \"Utilitzar les pref. de la web\" per utilitzar les preferències de la web"
 
-#: DlgAdvPreferences.cpp:1078 sg_DlgPreferences.cpp:1030
-msgid "Confirmation"
-msgstr "Confirmació"
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
+msgid "Using web-based preferences from"
+msgstr "Utilitzant les preferències de la web"
 
-#: DlgAdvPreferencesBase.cpp:46 sg_DlgPreferences.cpp:946
-#, c-format
-msgid "%s - Preferences"
-msgstr "%s - Preferències"
+#: clientgui/DlgAdvPreferencesBase.cpp:107 clientgui/sg_DlgPreferences.cpp:187
+msgid "Set values and click OK to use local preferences instead."
+msgstr "Introduir els valors i prémer D'ACORD per utilitzar les preferències locals."
 
-#: DlgAdvPreferencesBase.cpp:62
+#: 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 (except exclusive apps)."
-msgstr "Aquest finestra controla les preferències només d'aquest ordinador.\nPremi OK per confirmar les preferències.\nPremi Netejar per restaurar les preferències basades en la web (excepte les aplicacions exclusives)."
+"Click Clear to restore web-based settings."
+msgstr "Aquesta finestra controla només les preferències d'aquest equip.\nFeu clic a D'ACORD per establir preferències.\nFeu clic a ESBORRA per restablir la configuració basada en la web."
 
-#: DlgAdvPreferencesBase.cpp:65 sg_DlgPreferences.cpp:428
+#: clientgui/DlgAdvPreferencesBase.cpp:119
 msgid "Clear"
 msgstr "Netejar"
 
-#: DlgAdvPreferencesBase.cpp:66
-msgid "clear all local preferences and close the dialog"
-msgstr "netejar totes les preferències locals i tancar la finestra"
-
-#: DlgAdvPreferencesBase.cpp:81
-msgid "processor usage"
-msgstr "utilització de processador"
-
-#: DlgAdvPreferencesBase.cpp:84
-msgid "network usage"
-msgstr "utilització de la xarxa"
-
-#: DlgAdvPreferencesBase.cpp:87
-msgid "disk and memory usage"
-msgstr "utilització de disc i memòria"
-
-#: DlgAdvPreferencesBase.cpp:90
-msgid "exclusive applications"
-msgstr "aplicacions exclusives"
-
-#: DlgAdvPreferencesBase.cpp:102 sg_DlgPreferences.cpp:424
+#: clientgui/DlgAdvPreferencesBase.cpp:120
+msgid "Clear all local preferences and close the dialog."
+msgstr "Esborrar totes les preferències locals i tancar la finestra."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:215
+msgid "Use web prefs"
+msgstr "Utilitzar les pref. de la web"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
+msgid "Restore web-based preferences and close the dialog."
+msgstr "Restaurar les preferències basades en la web i tancar la finestra."
+
+#. Computing schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:148
+#: clientgui/DlgAdvPreferencesBase.cpp:688
+msgid "Computing"
+msgstr "Computant"
+
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
+msgid "Network"
+msgstr "Xarxa"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:154
+msgid "Disk and memory"
+msgstr "Disc i memòria"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:157
+msgid "Daily schedules"
+msgstr "Planificacions diàries"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:170
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:347
 msgid "OK"
 msgstr "OK"
 
-#: DlgAdvPreferencesBase.cpp:103
-msgid "save all values and close the dialog"
-msgstr "guardar tots els valors i tancar la finestra"
+#: clientgui/DlgAdvPreferencesBase.cpp:171
+msgid "Save all values and close the dialog."
+msgstr "Guardar totes les dades i tancar la finestra."
 
-#: DlgAdvPreferencesBase.cpp:108
-msgid "close the dialog without saving"
-msgstr "tancar la finestra sense guardar"
+#: clientgui/DlgAdvPreferencesBase.cpp:177
+msgid "Close the dialog without saving."
+msgstr "Tancar la finestra sense guardar."
 
-#: DlgAdvPreferencesBase.cpp:112 Localization.cpp:35 Localization.cpp:121
-#: Localization.cpp:139 sg_BoincSimpleFrame.cpp:794 sg_DlgPreferences.cpp:439
+#: 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:357
 msgid "Help"
 msgstr "Ajuda"
 
-#: DlgAdvPreferencesBase.cpp:113
-msgid "shows the preferences web page"
-msgstr "mostra la pàgina web de les preferències"
-
-#: DlgAdvPreferencesBase.cpp:135
-msgid "Computing allowed"
-msgstr "Computació disponible"
+#: clientgui/DlgAdvPreferencesBase.cpp:182
+msgid "Shows the preferences web page."
+msgstr "Mostra la pàgina de preferències de la web."
 
-#: DlgAdvPreferencesBase.cpp:139
-msgid "While computer is on batteries"
-msgstr "Mentre l'ordinador utilitza les bateries"
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:471
+msgid "Usage limits"
+msgstr "Límits d'utilització"
 
-#: DlgAdvPreferencesBase.cpp:142
+#: clientgui/DlgAdvPreferencesBase.cpp:249
+#, no-c-format
 msgid ""
-"check this if you want this computer to do work while it runs on batteries"
-msgstr "seleccioni-ho si desitja que l'ordinador realitzi feina mentre utilitza bateries"
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
+msgstr "Conserva algunes CPU lliures per a altres aplicacions. Exemple: 75% significa l'ús de 6 nuclis en una CPU de 8 nuclis."
 
-#: DlgAdvPreferencesBase.cpp:148
-msgid "While computer is in use"
-msgstr "Mentre l'ordinador està en us"
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
+msgid "Use at most"
+msgstr "Utilitzar com a màxim"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:256
+#, no-c-format
+msgid "% of the CPUs"
+msgstr "% de les CPU"
 
-#: DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
+#, no-c-format
 msgid ""
-"check this if you want this computer to do work even when you're using it"
-msgstr "seleccioni aquesta opció si desitja que l'ordinador treballi mentre l'està utilitzant"
+"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 "Suspendre/reprendre el càlcul cada pocs segons per reduir la temperatura de la CPU i l'ús d'energia. Exemple: 75% vol dir calcula durant 3 segons, espera durant 1 segon, i repeteix."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
+#, no-c-format
+msgid "% of CPU time"
+msgstr "% de temps de CPU"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:275
+msgid "When to suspend"
+msgstr "Quan suspendre"
 
-#: DlgAdvPreferencesBase.cpp:157
-msgid "Use GPU while computer is in use"
-msgstr "Utilitzar la GPU mentre l'ordinador està en us"
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
+msgid "Suspend when computer is on battery"
+msgstr "Suspendre quan l'equip està connectat a la bateria"
 
-#: DlgAdvPreferencesBase.cpp:160
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
-"check this if you want your GPU to do work even when you're using the "
-"computer"
-msgstr "seleccioni aquesta opció si desitja utilitzar la GPU per fer feina al mateix temps que està utilitzant l'ordinador"
+"Check this to suspend computing on portables when running on battery power."
+msgstr "Marca aquesta opció per suspendre la computació en els portàtils funcionant amb la bateria."
 
-#: DlgAdvPreferencesBase.cpp:172
-msgid "Only after computer has been idle for"
-msgstr "Només després de que l'ordinador hagi estat inactiu uns"
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
+msgid "Suspend when computer is in use"
+msgstr "Suspendre quan l'ordinador estigui en us"
 
-#: DlgAdvPreferencesBase.cpp:182
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
-"do work only after you haven't used the computer for this number of minutes"
-msgstr "fer feina només després de no haver utilitzat l'ordinador en el següent nombre de minuts"
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Marca aquesta opció per suspendre la computació i la transferència d'arxius mentre estàs utilitzant l'ordinador."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:299
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Suspèn la computació amb la GPU mentre l'ordinador està en ús"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:302
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "Marca aquesta opció per suspendre la computació amb la GPU mentre estàs utilitzant l'ordinador."
 
-#: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
-#: sg_DlgPreferences.cpp:417
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Això determina quan l'ordinador es considera \"en ús\"."
+
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'En ús' significa activitat del ratolí/teclat"
+
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "minuts"
 
-#: DlgAdvPreferencesBase.cpp:206
-msgid "While processor usage is less than"
-msgstr "Mentre la utilització del processador és inferior a"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Suspendre quan l'ús de la CPU per processos que no siguin de BOINC està per sobre de"
 
-#: DlgAdvPreferencesBase.cpp:216
-msgid "suspend work if processor usage exceeds this level"
-msgstr "suspendre el treball si el processador excedeix aquest nivell"
+#: clientgui/DlgAdvPreferencesBase.cpp:333
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Suspendre la computació quan l'equip està ocupat executant altres programes."
 
-#: DlgAdvPreferencesBase.cpp:221
-msgid "percent (0 means no restriction)"
-msgstr "perntatge (0 significa sense restriccions)"
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
+msgid "Other"
+msgstr "Un altre"
 
-#: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
-msgid "Every day between hours of"
-msgstr "Cada dia entre les hores"
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "Emmagatzemar almenys prou feines per mantenir l'equip ocupat durant tant de temps."
 
-#: DlgAdvPreferencesBase.cpp:239
-msgid "start work at this time"
-msgstr "començar a fer feina a aquesta hora"
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
+msgid "Store at least"
+msgstr "Emmagatzemar almenys"
 
-#: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
-#: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
-msgid "and"
-msgstr "i"
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
+msgid "days of work"
+msgstr "dies de treball"
 
-#: DlgAdvPreferencesBase.cpp:247
-msgid "stop work at this time"
-msgstr "aturar de fer feina a aquesta hora"
+#: clientgui/DlgAdvPreferencesBase.cpp:384
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "Desar tasques addicionals per sobre del nivell mínim. Determina la quantitat de treball es demana al contactar amb un projecte."
 
-#: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
-msgid "(no restriction if equal)"
-msgstr "(cap restricció si és igual)"
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
+msgid "Store up to an additional"
+msgstr "Emmagatzema fins a un màxim de"
 
-#: DlgAdvPreferencesBase.cpp:256 DlgAdvPreferencesBase.cpp:517
-msgid "Day-of-week override:"
-msgstr "Horari preferit dels dies de la setmana. Aquesta selecció és la que s'aplicarà:"
+#: clientgui/DlgAdvPreferencesBase.cpp:407
+#, c-format
+msgid "If you run several projects, %s may switch between them this often."
+msgstr "Si executes diversos projectes, %s pot canviar sovint entre ells."
 
-#: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
-msgid "check box to specify hours for this day of week"
-msgstr "marcar la casella per especificar les hores per aquest dia de la setmana"
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
+msgid "Switch between tasks every"
+msgstr "Canviar entre tasques cada"
 
-#: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
-msgid "Monday"
-msgstr "Dilluns"
+#: clientgui/DlgAdvPreferencesBase.cpp:427
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "Això controla la freqüència en la que les tasques guarden el seu estat a disc, de manera que es poden reiniciar més tard."
 
-#: DlgAdvPreferencesBase.cpp:274 DlgAdvPreferencesBase.cpp:535
-msgid "Tuesday"
-msgstr "Dimarts"
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
+msgid "Request tasks to checkpoint at most every"
+msgstr "Sol·licitar tasques al control almenys cada"
 
-#: DlgAdvPreferencesBase.cpp:281 DlgAdvPreferencesBase.cpp:542
-msgid "Wednesday"
-msgstr "Dimecres"
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
+msgid "seconds"
+msgstr "segons"
 
-#: DlgAdvPreferencesBase.cpp:288 DlgAdvPreferencesBase.cpp:549
-msgid "Thursday"
-msgstr "Dijous"
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
+msgid "Limit the download rate of file transfers."
+msgstr "Limitar la taxa de baixada en la transferència de fitxers."
 
-#: DlgAdvPreferencesBase.cpp:295 DlgAdvPreferencesBase.cpp:556
-msgid "Friday"
-msgstr "Divendres"
+#: clientgui/DlgAdvPreferencesBase.cpp:478
+msgid "Limit download rate to"
+msgstr "Limita la taxa de baixada a"
 
-#: DlgAdvPreferencesBase.cpp:302 DlgAdvPreferencesBase.cpp:563
-msgid "Saturday"
-msgstr "Dissabte"
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
+msgid "KB/second"
+msgstr "Kb/segon"
 
-#: DlgAdvPreferencesBase.cpp:309 DlgAdvPreferencesBase.cpp:570
-msgid "Sunday"
-msgstr "Diumenge"
+#: clientgui/DlgAdvPreferencesBase.cpp:486
+msgid "Limit the upload rate of file transfers."
+msgstr "Limitar la taxa de pujada en la transferència de fitxers."
 
-#: DlgAdvPreferencesBase.cpp:323
-msgid "Other options"
-msgstr "Altres opcions"
+#: clientgui/DlgAdvPreferencesBase.cpp:487
+msgid "Limit upload rate to"
+msgstr "Taxa límit de pujada a"
 
-#: DlgAdvPreferencesBase.cpp:330
-msgid "Switch between applications every"
-msgstr "Canviar entre aplicacions cada"
+#: clientgui/DlgAdvPreferencesBase.cpp:498
+#, c-format
+msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
+msgstr "Exemple: %s ha de transferir com a màxim 2000 MB de dades cada 30 dies."
 
-#: DlgAdvPreferencesBase.cpp:339
-msgid "On multiprocessor systems, use at most"
-msgstr "En equips multi-processador, utilitzar com a màxim"
+#: clientgui/DlgAdvPreferencesBase.cpp:500
+msgid "Limit usage to"
+msgstr "Limita l'us fins"
 
-#: DlgAdvPreferencesBase.cpp:346
-#, no-c-format
-msgid "% of the processors (0 means ignore this setting)"
-msgstr "% dels processadors (0 significa ignorar aquesta opció)"
+#: clientgui/DlgAdvPreferencesBase.cpp:504
+msgid "MB every"
+msgstr "MB cada"
 
-#: DlgAdvPreferencesBase.cpp:349 DlgAdvPreferencesBase.cpp:605
-#: DlgAdvPreferencesBase.cpp:627 DlgAdvPreferencesBase.cpp:648
-#: DlgAdvPreferencesBase.cpp:669 DlgAdvPreferencesBase.cpp:679
-msgid "Use at most"
-msgstr "Utilitzar com a màxim"
+#: clientgui/DlgAdvPreferencesBase.cpp:508
+msgid "days"
+msgstr "dies"
 
-#: DlgAdvPreferencesBase.cpp:356
-#, no-c-format
-msgid "% CPU time"
-msgstr "% temps de CPU"
+#: clientgui/DlgAdvPreferencesBase.cpp:530
+#, c-format
+msgid ""
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of %s."
+msgstr "Selecciona aquesta opció només si el teu proveïdor d'Internet modifica els arxius d'imatge. Ometre la verificació redueix la seguretat de %s."
 
-#: DlgAdvPreferencesBase.cpp:378
-msgid "General options"
-msgstr "Opcions generals"
+#: clientgui/DlgAdvPreferencesBase.cpp:532
+msgid "Skip data verification for image files"
+msgstr "Ometre la verificació de la data del fitxers imatge"
 
-#: DlgAdvPreferencesBase.cpp:386
-msgid "Maximum download rate"
-msgstr "Màxima taxa de descàrrega"
+#: clientgui/DlgAdvPreferencesBase.cpp:536
+msgid "Confirm before connecting to Internet"
+msgstr "Confirmar abans de connectar-se a Internet"
 
-#: DlgAdvPreferencesBase.cpp:392 DlgAdvPreferencesBase.cpp:401
-msgid "KBytes/sec."
-msgstr "KBytes/seg."
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Útil només si disposes d'una connexió per mòdem, ISDN o VPN."
 
-#: DlgAdvPreferencesBase.cpp:395
-msgid "Maximum upload rate"
-msgstr "Màxima taxa de càrrega"
+#: clientgui/DlgAdvPreferencesBase.cpp:540
+msgid "Disconnect when done"
+msgstr "Desconnectar en finalitzar"
 
-#: DlgAdvPreferencesBase.cpp:406
-msgid "Transfer at most"
-msgstr "Transferir com a molt"
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
+msgid "Disk"
+msgstr "Disc"
 
-#: DlgAdvPreferencesBase.cpp:412
-msgid "Mbytes"
-msgstr "Mbytes"
+#: clientgui/DlgAdvPreferencesBase.cpp:572
+#, c-format
+msgid "%s will use the most restrictive of these settings:"
+msgstr "%s utilitzarà la més restrictiva d'aquestes opcions:"
 
-#: DlgAdvPreferencesBase.cpp:415
-msgid "every"
-msgstr "cada"
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
+#, c-format
+msgid "Limit the total amount of disk space used by %s."
+msgstr "Limita la quantitat total d'espai en disc utilitzat per %s."
 
-#: DlgAdvPreferencesBase.cpp:421 DlgAdvPreferencesBase.cpp:444
-#: DlgAdvPreferencesBase.cpp:463
-msgid "days"
-msgstr "dies"
+#: clientgui/DlgAdvPreferencesBase.cpp:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
+msgid "Use no more than"
+msgstr "No utilitzar més de"
 
-#: DlgAdvPreferencesBase.cpp:429
-msgid "Minimum work buffer"
-msgstr "Buffer mínim de treball"
+#: clientgui/DlgAdvPreferencesBase.cpp:585
+msgid "GB"
+msgstr "GB"
 
-#: DlgAdvPreferencesBase.cpp:438
-msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "Intenti mantenir suficients tasques per mantenir-lo ocupat durant molts dies"
+#: clientgui/DlgAdvPreferencesBase.cpp:590
+#, c-format
+msgid ""
+"Limit disk usage to leave this much free space on the volume where %s stores"
+" data."
+msgstr "Limita l'ús de disc per deixar el màxim espai lliure en el volum on %s emmagatzema dades."
 
-#: DlgAdvPreferencesBase.cpp:450
-msgid "Max additional work buffer"
-msgstr "Màxim buffer addicional de treball"
+#: clientgui/DlgAdvPreferencesBase.cpp:593
+msgid "Leave at least"
+msgstr "Deixar al menys"
 
-#: DlgAdvPreferencesBase.cpp:459
-msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "A més, mantenir les tasques suficients per tenir-lo actiu molts dies"
+#: clientgui/DlgAdvPreferencesBase.cpp:597
+msgid "GB free"
+msgstr "Gb lliures"
 
-#: DlgAdvPreferencesBase.cpp:466
-msgid "Skip image file verification"
-msgstr "Ometre la verificació del fitxer"
+#: clientgui/DlgAdvPreferencesBase.cpp:602
+#, c-format
+msgid ""
+"Limit the percentage of disk space used by %s on the volume where it stores "
+"data."
+msgstr "Limita el percentatge d'espai en disc utilitzat per %s en el volum en el qual emmagatzema dades."
 
-#: DlgAdvPreferencesBase.cpp:468
-msgid "check this if your Internet provider modifies image files"
-msgstr "seleccioni-ho si el seu proveïdor d'Internet modifica els fitxers"
+#: clientgui/DlgAdvPreferencesBase.cpp:610
+#, no-c-format
+msgid "% of total"
+msgstr "% del total"
 
-#: DlgAdvPreferencesBase.cpp:476
-msgid "Connect options"
-msgstr "Opcions de connexió"
+#: clientgui/DlgAdvPreferencesBase.cpp:617
+msgid "Memory"
+msgstr "Memòria"
 
-#: DlgAdvPreferencesBase.cpp:478
-msgid "Confirm before connecting to internet"
-msgstr "Confirmar abans de connectar a internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:622
+#, c-format
+msgid "Limit the memory used by %s when you're using the computer."
+msgstr "Limita la memòria utilitzada per %s quan estàs utilitzant l'ordinador."
 
-#: DlgAdvPreferencesBase.cpp:480
-msgid ""
-"if checked, a confirmation dialog will be displayed before trying to connect"
-" to the Internet"
-msgstr "si està seleccionat, una finestra de confirmació es mostrarà abans d'intentar connectar a Internet"
+#: clientgui/DlgAdvPreferencesBase.cpp:624
+msgid "When computer is in use, use at most"
+msgstr "Quan l'ordinador està en ús, utilitzar com a màxim"
 
-#: DlgAdvPreferencesBase.cpp:484
-msgid "Disconnect when done"
-msgstr "Desconnectar en finalitzar"
+#: clientgui/DlgAdvPreferencesBase.cpp:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: DlgAdvPreferencesBase.cpp:486
-msgid ""
-"if checked, BOINC hangs up when network usage is done\n"
-"(only relevant for dialup-connection)"
-msgstr "si està seleccionat, BOINC penja quan finalitza l'activitat de xarxa\n(només es vàlid per connexions telefòniques)"
+#: clientgui/DlgAdvPreferencesBase.cpp:635
+#, c-format
+msgid "Limit the memory used by %s when you're not using the computer."
+msgstr "Limita la memòria utilitzada per %s quan no estàs utilitzant l'equip."
 
-#: DlgAdvPreferencesBase.cpp:492
-msgid "Network usage allowed"
-msgstr "Es permet la utilització de la xarxa"
+#: clientgui/DlgAdvPreferencesBase.cpp:637
+msgid "When computer is not in use, use at most"
+msgstr "Memòria: quan l'ordinador no està en ús, utilitzar com a màxim"
 
-#: DlgAdvPreferencesBase.cpp:500
-msgid "network usage start hour"
-msgstr "hora d'inici d'utilització de la xarxa"
+#: clientgui/DlgAdvPreferencesBase.cpp:646
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Deixar les aplicacions que no son de GPU en memòria mentre estan en suspens"
 
-#: DlgAdvPreferencesBase.cpp:508
-msgid "network usage stop hour"
-msgstr "hora de fi d'utilització de la xarxa"
+#: clientgui/DlgAdvPreferencesBase.cpp:647
+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 es marca, les tasques suspeses romanen en la memòria, i es poden reprendre sense pèrdua de feina. Si no es marca, les tasques suspeses s'eliminen de la memòria, i es reprenen des del seu últim punt de control."
 
-#: DlgAdvPreferencesBase.cpp:598 DlgItemProperties.cpp:231
-msgid "Disk usage"
-msgstr "Utilització de disc"
+#: clientgui/DlgAdvPreferencesBase.cpp:651
+#, c-format
+msgid "Limit the swap space (page file) used by %s."
+msgstr "Limita l'espai d'intercanvi (arxiu de paginació) utilitzat per %s."
 
-#: DlgAdvPreferencesBase.cpp:609
-msgid "the maximum disk space used by BOINC (in Gigabytes)"
-msgstr "màxim espai en disc utilitzat per BOINC (en Gigabytes)"
+#: clientgui/DlgAdvPreferencesBase.cpp:653
+msgid "Page/swap file: use at most"
+msgstr "Espai d'intercanvi: utilitzar com a màxim"
 
-#: DlgAdvPreferencesBase.cpp:613
-msgid "Gigabytes disk space"
-msgstr "Gigabytes de espai en disc"
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
+msgid "and"
+msgstr "i"
 
-#: DlgAdvPreferencesBase.cpp:616
-msgid "Leave at least"
-msgstr "Deixar al menys"
+#: clientgui/DlgAdvPreferencesBase.cpp:679
+msgid "to"
+msgstr "a"
 
-#: DlgAdvPreferencesBase.cpp:620
-msgid "BOINC leaves at least this amount of disk space free (in Gigabytes)"
-msgstr "BOINC deixa lliure al menys aquest espai en disc (en Gigabytes)"
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
+msgid "Compute only during a particular period each day."
+msgstr "Calcular només durant un període determinat cada dia."
 
-#: DlgAdvPreferencesBase.cpp:624
-msgid "Gigabytes disk space free"
-msgstr "Gigabytes d'espai en disc lliure"
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
+msgid "Compute only between"
+msgstr "Calcular només entre"
 
-#: DlgAdvPreferencesBase.cpp:631
-msgid "BOINC uses at most this percentage of total disk space"
-msgstr "BOINC utilitza com a mínim aquest percentatge del total d'espai en disc"
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
+msgid "Day-of-week override"
+msgstr "Sobreescriure el dia de la setmana"
 
-#: DlgAdvPreferencesBase.cpp:636
-#, no-c-format
-msgid "% of total disk space"
-msgstr "% del total d'espai en disc"
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
+msgid "Override the times above on the selected days:"
+msgstr "Sobreescriure els temps de d'alt els següents dies:"
 
-#: DlgAdvPreferencesBase.cpp:639
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Actualitzar els punts de control de les tasques cada"
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
+msgid "Monday"
+msgstr "Dilluns"
 
-#: DlgAdvPreferencesBase.cpp:645
-msgid "seconds"
-msgstr "segons"
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
+msgid "Friday"
+msgstr "Divendres"
 
-#: DlgAdvPreferencesBase.cpp:655
-#, no-c-format
-msgid "% of page file (swap space)"
-msgstr "% del fitxer d'intercanvi (espai d'intercanvi)"
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
+msgid "Tuesday"
+msgstr "Dimarts"
 
-#: DlgAdvPreferencesBase.cpp:662
-msgid "Memory usage"
-msgstr "Utilització de memòria"
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
+msgid "Saturday"
+msgstr "Dissabte"
 
-#: DlgAdvPreferencesBase.cpp:676
-#, no-c-format
-msgid "% when computer is in use"
-msgstr "% quan l'ordinador està en ús"
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
+msgid "Wednesday"
+msgstr "Dimecres"
 
-#: DlgAdvPreferencesBase.cpp:686
-#, no-c-format
-msgid "% when computer is idle"
-msgstr "% quan l'ordinador està en repòs"
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
+msgid "Sunday"
+msgstr "Diumenge"
 
-#: DlgAdvPreferencesBase.cpp:691
-msgid "Leave applications in memory while suspended"
-msgstr "Deixar les aplicacions en memòria mentre estan en suspens"
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
+msgid "Thursday"
+msgstr "Dijous"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
+msgid "Transfer files only during a particular period each day."
+msgstr "Transferir fitxers només durant un període de temps cada dia."
 
-#: DlgAdvPreferencesBase.cpp:693
-msgid "if checked, suspended work units are left in memory"
-msgstr "si està seleccionat, els treballs aturats es deixen en memòria"
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
+msgid "Transfer files only between"
+msgstr "Transferir fitxers només entre"
 
-#: DlgAdvPreferencesBase.cpp:713
+#: clientgui/DlgDiagnosticLogFlags.cpp:65
+#, c-format
+msgid "%s Diagnostic Log Flags"
+msgstr "%s Indicadors del Registre de Diagnòstic"
+
+#: clientgui/DlgDiagnosticLogFlags.cpp:83
 msgid ""
-"Suspend processor and network usage when these applications are running:"
-msgstr "Suspendre l'ús del processador i de la xarxa quan aquestes aplicacions s'estan executant:"
+"These flags enable various types of diagnostic messages in the Event Log."
+msgstr "Aquests indicadors permeten diferents tipus de missatges de diagnòstic en el registre d'esdeveniments."
 
-#: DlgAdvPreferencesBase.cpp:722
-msgid "Add..."
-msgstr "Afegir..."
+#: clientgui/DlgDiagnosticLogFlags.cpp:99
+msgid "More info ..."
+msgstr "Més informació ..."
 
-#: DlgAdvPreferencesBase.cpp:723
-msgid "Add an application to this list"
-msgstr "Afegir una aplicació a la llista"
+#: clientgui/DlgDiagnosticLogFlags.cpp:120 clientgui/DlgHiddenColumns.cpp:101
+msgid "Save all values and close the dialog"
+msgstr "Desa tots els valors i tancar el diàleg"
 
-#: DlgAdvPreferencesBase.cpp:728 ViewProjects.cpp:202
-#: sg_ProjectCommandPopup.cpp:85
-msgid "Remove"
-msgstr "Eliminar"
+#: clientgui/DlgDiagnosticLogFlags.cpp:123 clientgui/DlgHiddenColumns.cpp:104
+msgid "Defaults"
+msgstr "Opcions per defecte"
 
-#: DlgAdvPreferencesBase.cpp:729
-msgid "Remove an application from this list"
-msgstr "Eliminar una aplicació d'aquesta llista"
+#: clientgui/DlgDiagnosticLogFlags.cpp:124 clientgui/DlgHiddenColumns.cpp:105
+msgid "Restore default settings"
+msgstr "Restaura la configuració per defecte"
 
-#: DlgAdvPreferencesBase.cpp:738
-msgid "For advanced options, refer to "
-msgstr "Per a les opcions avançades, vegeu "
+#: clientgui/DlgDiagnosticLogFlags.cpp:128 clientgui/DlgHiddenColumns.cpp:109
+msgid "Close the dialog without saving"
+msgstr "Tanca el diàleg sense guardar"
 
-#: DlgEventLog.cpp:219
+#: clientgui/DlgEventLog.cpp:227
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Registre d'esdeveniments"
 
-#: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
-#: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
-#: ViewWork.cpp:232
+#. 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 "Projecte"
 
-#: DlgEventLog.cpp:233 ViewMessages.cpp:118
+#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
 msgid "Time"
 msgstr "Hora"
 
-#: DlgEventLog.cpp:234 ViewMessages.cpp:119
+#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
 msgid "Message"
 msgstr "Missatge"
 
-#: DlgEventLog.cpp:290 DlgEventLog.cpp:354
+#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
 msgid "&Show only this project"
 msgstr "&Mostrar només aquest projecte"
 
-#: DlgEventLog.cpp:294
+#: clientgui/DlgEventLog.cpp:305
 msgid "Copy &All"
 msgstr "&Copiar-ho Tot"
 
-#: DlgEventLog.cpp:296 DlgEventLog.cpp:300 ViewMessages.cpp:89
+#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Copiar tots els missatges al porta papers."
 
-#: DlgEventLog.cpp:305
+#: clientgui/DlgEventLog.cpp:316
 msgid "Copy &Selected"
 msgstr "Copiar els &seleccionats"
 
-#: DlgEventLog.cpp:308 DlgEventLog.cpp:316 ViewMessages.cpp:97
+#: 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 "Copiar els missatges seleccionats al porta papers. Pot seleccionar diversos missatges prement les tecles shift o control mentre prem en els missatges."
 
-#: DlgEventLog.cpp:310 DlgEventLog.cpp:318 ViewMessages.cpp:99
+#: 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 "Copiar els missatges seleccionats al porta papers. Pot seleccionar diversos missatges prement les tecles shift o control mentre prem en els missatges."
 
-#: DlgEventLog.cpp:325 DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Tancar"
 
-#: DlgEventLog.cpp:334 sg_BoincSimpleFrame.cpp:798 sg_DlgPreferences.cpp:442
-#, c-format
-msgid "Get help with %s"
-msgstr "Obtenir ajuda amb %s"
-
-#: DlgEventLog.cpp:348
+#: clientgui/DlgEventLog.cpp:345
 msgid "Show all &messages"
 msgstr "Mostrar &tots els missatges"
 
-#: DlgEventLog.cpp:349 DlgEventLog.cpp:351
+#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
 msgid "Show messages for all projects"
 msgstr "Mostrar els missatges de tots els projectes"
 
-#: DlgEventLog.cpp:355 DlgEventLog.cpp:357
+#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
 msgid "Show only the messages for the selected project"
 msgstr "Mostrar només el missatges del projecte seleccionat"
 
-#: DlgExitMessage.cpp:82
+#: clientgui/DlgExclusiveApps.cpp:60
+#, c-format
+msgid "%s - Exclusive Applications"
+msgstr "%s - Aplicacions Exclusives"
+
+#: clientgui/DlgExclusiveApps.cpp:72
+msgid ""
+"Suspend processor and network usage when these applications are running:"
+msgstr "Suspendre l'ús del processador i de la xarxa quan aquestes aplicacions s'estan executant:"
+
+#: clientgui/DlgExclusiveApps.cpp:80 clientgui/DlgExclusiveApps.cpp:104
+msgid "Add..."
+msgstr "Afegir..."
+
+#: clientgui/DlgExclusiveApps.cpp:81 clientgui/DlgExclusiveApps.cpp:105
+msgid "Add an application to this list"
+msgstr "Afegir una aplicació a la llista"
+
+#: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:90
+msgid "Remove"
+msgstr "Eliminar"
+
+#: clientgui/DlgExclusiveApps.cpp:87 clientgui/DlgExclusiveApps.cpp:111
+msgid "Remove an application from this list"
+msgstr "Eliminar una aplicació d'aquesta llista"
+
+#: clientgui/DlgExclusiveApps.cpp:96
+msgid "Suspend GPU usage when these applications are running:"
+msgstr "Aturar la utilització de la GPU quan les següents aplicacions estiguin en ús:"
+
+#: clientgui/DlgExclusiveApps.cpp:122
+msgid "For advanced options, refer to "
+msgstr "Per a les opcions avançades, vegeu "
+
+#: clientgui/DlgExclusiveApps.cpp:147
+msgid "save all values and close the dialog"
+msgstr "guardar tots els valors i tancar la finestra"
+
+#: clientgui/DlgExclusiveApps.cpp:153
+msgid "close the dialog without saving"
+msgstr "tancar la finestra sense guardar"
+
+#: clientgui/DlgExclusiveApps.cpp:158
+msgid "shows the preferences web page"
+msgstr "mostra la pàgina web de les preferències"
+
+#. 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 "Aplicacions per afegir"
+
+#: clientgui/DlgExclusiveApps.cpp:332
+#, c-format
+msgid "'%s' is not an executable application."
+msgstr "'%s' no és una aplicació executable."
+
+#: clientgui/DlgExclusiveApps.cpp:333 clientgui/DlgExclusiveApps.cpp:380
+#: clientgui/DlgExclusiveApps.cpp:404
+msgid "Add Exclusive App"
+msgstr "Afegeix l'aplicació exclusiva"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Name of application to add?"
+msgstr "Nom de l'aplicació per afegir?"
+
+#: clientgui/DlgExclusiveApps.cpp:345
+msgid "Add exclusive app"
+msgstr "Afegir aplicació exclusiva"
+
+#: clientgui/DlgExclusiveApps.cpp:379
+#, c-format
+msgid "Application names must end with '%s'"
+msgstr "Els noms d'aplicació han d'acabar amb '%s'"
+
+#: clientgui/DlgExclusiveApps.cpp:403
+#, c-format
+msgid "'%s' is already in the list."
+msgstr "'%s' ja està a la llista."
+
+#: clientgui/DlgExitMessage.cpp:82
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - Confirmació de Sortida"
 
-#: DlgExitMessage.cpp:130
+#: clientgui/DlgExitMessage.cpp:130
 #, c-format
 msgid ""
 "You have requested to exit the %s,\n"
@@ -1553,7 +1784,7 @@ msgid ""
 "choose from the following options:"
 msgstr "Ha sol·licitat sortir de %s\nque li permet veure i administrar\nles tasques en execució en el seu ordinador.\n\nSi també desitja aturar l'execució de les tasques,\ntriar entre les següents opcions:"
 
-#: DlgExitMessage.cpp:135
+#: clientgui/DlgExitMessage.cpp:135
 #, c-format
 msgid ""
 "This will shut down %s and its tasks until either the\n"
@@ -1564,814 +1795,852 @@ msgid ""
 "tasks at the times you selected in your preferences."
 msgstr "Això aturarà %s i les seves tasques fins que el programa\n%s o el protector de pantalla %s s'executin de nou.\n\nLa majoria de vegades, es millor tancar la finestra de %s en lloc\nde finalitzar l'aplicació; això permetrà %s executar les seves tasques\nen els períodes de temps que ha seleccionat en les seves preferències."
 
-#: DlgExitMessage.cpp:153
+#: clientgui/DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
 msgstr "Aturar l'execució de tasques en sortir de %s"
 
-#: DlgExitMessage.cpp:165
+#: clientgui/DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
 msgstr "Recordar aquesta opció i no mostrar aquesta finestra."
 
-#: DlgExitMessage.cpp:178 DlgGenericMessage.cpp:125 DlgOptions.cpp:401
-#: DlgSelectComputer.cpp:168 wizardex.cpp:378
+#: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
+#: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Cancel·lar"
 
-#: DlgGenericMessage.cpp:112
+#: clientgui/DlgGenericMessage.cpp:112
 msgid "Don't show this dialog again."
 msgstr "No tornar a mostrar aquesta finestra."
 
-#: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
-#: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
+#: clientgui/DlgHiddenColumns.cpp:64
+#, c-format
+msgid "%s Column Selection"
+msgstr "%s Selecció de Columnes"
+
+#: clientgui/DlgHiddenColumns.cpp:77
+#, c-format
+msgid "Select which columns %s should show."
+msgstr "Selecciona quines columnes %s s'han de mostrar"
+
+#: clientgui/DlgHiddenColumns.cpp:314
+msgid ""
+"Are you sure you want to reset all list columns to the default "
+"configurations?"
+msgstr "Estàs segur que vols reiniciar totes llistes de columnes a la seva configuració defecte?"
+
+#: clientgui/DlgHiddenColumns.cpp:315
+msgid "Confirm defaults"
+msgstr "Confirma els valors defecte"
+
+#: clientgui/DlgItemProperties.cpp:194 clientgui/DlgItemProperties.cpp:197
+#: clientgui/DlgItemProperties.cpp:200 clientgui/DlgItemProperties.cpp:203
 msgid "Don't fetch tasks for "
 msgstr "No obtenir tasques per "
 
-#: DlgItemProperties.cpp:168
+#: clientgui/DlgItemProperties.cpp:194
 msgid "Project preference"
 msgstr "Projecte preferent"
 
-#: DlgItemProperties.cpp:171
+#: clientgui/DlgItemProperties.cpp:197
 msgid "Account manager preference"
 msgstr "Preferències de l'administrador de comptes"
 
-#: DlgItemProperties.cpp:174
+#: clientgui/DlgItemProperties.cpp:200
 msgid "Project has no apps for "
 msgstr "El projecte no té aplicacions per "
 
-#: DlgItemProperties.cpp:177
+#: clientgui/DlgItemProperties.cpp:203
 msgid "Client configuration excludes "
 msgstr "La configuració del client exclou "
 
-#: DlgItemProperties.cpp:181
+#: clientgui/DlgItemProperties.cpp:207
 msgid " work fetch deferred for"
 msgstr " feina ajornada durant"
 
-#: DlgItemProperties.cpp:182
+#: clientgui/DlgItemProperties.cpp:208
 msgid " work fetch deferral interval"
 msgstr " interval d'ajornament de la feina"
 
-#: DlgItemProperties.cpp:213
+#. set dialog title
+#: clientgui/DlgItemProperties.cpp:239
 msgid "Properties of project "
 msgstr "Propietats del projecte "
 
-#: DlgItemProperties.cpp:217 DlgOptions.cpp:218
+#. layout controls
+#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "General"
 
-#: DlgItemProperties.cpp:218
+#: clientgui/DlgItemProperties.cpp:244
 msgid "Master URL"
 msgstr "URL principal"
 
-#: DlgItemProperties.cpp:219
+#: clientgui/DlgItemProperties.cpp:245
 msgid "User name"
 msgstr "Nom del usuari"
 
-#: DlgItemProperties.cpp:220
+#: clientgui/DlgItemProperties.cpp:246
 msgid "Team name"
 msgstr "Nom de l'equip"
 
-#: DlgItemProperties.cpp:221 ViewProjects.cpp:224
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "Compartició de recursos"
 
-#: DlgItemProperties.cpp:223
+#: clientgui/DlgItemProperties.cpp:249
 msgid "Scheduler RPC deferred for"
 msgstr "La programació RPC s'ha ajornat durant"
 
-#: DlgItemProperties.cpp:226
+#: clientgui/DlgItemProperties.cpp:252
 msgid "File downloads deferred for"
 msgstr "Descàrrega de fitxers posposada durant"
 
-#: DlgItemProperties.cpp:229
+#: clientgui/DlgItemProperties.cpp:255
 msgid "File uploads deferred for"
 msgstr "Lliurament de fitxers posposada durant"
 
-#: DlgItemProperties.cpp:232
+#: clientgui/DlgItemProperties.cpp:257
+msgid "Disk usage"
+msgstr "Utilització de disc"
+
+#: clientgui/DlgItemProperties.cpp:258
 msgid "Computer ID"
 msgstr "ID de l'ordinador"
 
-#: DlgItemProperties.cpp:234
+#: clientgui/DlgItemProperties.cpp:260
 msgid "Non CPU intensive"
 msgstr "Us no intensiu de la CPU"
 
-#: DlgItemProperties.cpp:234 DlgItemProperties.cpp:236
-#: DlgItemProperties.cpp:237 DlgItemProperties.cpp:239
-#: DlgItemProperties.cpp:242 DlgItemProperties.cpp:251
-#: DlgItemProperties.cpp:254 DlgItemProperties.cpp:257
+#: 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 "si"
 
-#: DlgItemProperties.cpp:236
+#: clientgui/DlgItemProperties.cpp:262
 msgid "Suspended via GUI"
 msgstr "Aturat via GUI"
 
-#: DlgItemProperties.cpp:236 DlgItemProperties.cpp:237
+#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
 msgid "no"
 msgstr "no"
 
-#: DlgItemProperties.cpp:237
+#: clientgui/DlgItemProperties.cpp:263
 msgid "Don't request more work"
 msgstr "No demanar més feina"
 
-#: DlgItemProperties.cpp:239
+#: clientgui/DlgItemProperties.cpp:265
 msgid "Scheduler call in progress"
 msgstr "Petició programada en execució"
 
-#: DlgItemProperties.cpp:242
+#: clientgui/DlgItemProperties.cpp:268
 msgid "Trickle-up pending"
 msgstr "Informació pendent"
 
-#: DlgItemProperties.cpp:245 DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
 msgid "Host location"
 msgstr "Ubicació dl'ordinador central"
 
-#: DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:273
 msgid "default"
 msgstr "per defecte"
 
-#: DlgItemProperties.cpp:251
+#: clientgui/DlgItemProperties.cpp:277
 msgid "Added via account manager"
 msgstr "Afegit via l'administrador de comptes"
 
-#: DlgItemProperties.cpp:254
+#: clientgui/DlgItemProperties.cpp:280
 msgid "Remove when tasks done"
 msgstr "Eliminar quan les tasques hagin finalitzat"
 
-#: DlgItemProperties.cpp:257
+#: clientgui/DlgItemProperties.cpp:283
 msgid "Ended"
 msgstr "Finalitzat"
 
-#: DlgItemProperties.cpp:259
+#: clientgui/DlgItemProperties.cpp:285
+msgid "Tasks completed"
+msgstr "Feines finalitzades"
+
+#: clientgui/DlgItemProperties.cpp:286
+msgid "Tasks failed"
+msgstr "Feines fallides"
+
+#: clientgui/DlgItemProperties.cpp:288
 msgid "Credit"
 msgstr "Crèdit"
 
-#: DlgItemProperties.cpp:260
+#: clientgui/DlgItemProperties.cpp:289
 msgid "User"
 msgstr "Usuari"
 
-#: DlgItemProperties.cpp:267
+#: clientgui/DlgItemProperties.cpp:296
 msgid "Host"
 msgstr "Ordinador central"
 
-#: DlgItemProperties.cpp:276
+#: clientgui/DlgItemProperties.cpp:305
 msgid "Scheduling"
 msgstr "Planificant"
 
-#: DlgItemProperties.cpp:277
+#: clientgui/DlgItemProperties.cpp:306
 msgid "Scheduling priority"
 msgstr "Planificació prioritària"
 
-#: DlgItemProperties.cpp:278
+#: clientgui/DlgItemProperties.cpp:307
 msgid "CPU"
 msgstr "CPU"
 
-#: DlgItemProperties.cpp:302
+#: clientgui/DlgItemProperties.cpp:331
 msgid "Duration correction factor"
 msgstr "Durada del factor de correcció"
 
-#: DlgItemProperties.cpp:316
+#: clientgui/DlgItemProperties.cpp:345
 msgid "Properties of task "
 msgstr "Propietats de la tasca "
 
-#: DlgItemProperties.cpp:328 ViewWork.cpp:238
+#: clientgui/DlgItemProperties.cpp:357 clientgui/ViewWork.cpp:266
 msgid "Application"
 msgstr "Aplicació"
 
-#: DlgItemProperties.cpp:329 ViewWork.cpp:239
+#: clientgui/DlgItemProperties.cpp:358 clientgui/ViewWork.cpp:267
 msgid "Name"
 msgstr "Nom"
 
-#: DlgItemProperties.cpp:330
+#: clientgui/DlgItemProperties.cpp:359
 msgid "State"
 msgstr "Estat"
 
-#: DlgItemProperties.cpp:333
+#: clientgui/DlgItemProperties.cpp:362
 msgid "Received"
 msgstr "Rebut"
 
-#: DlgItemProperties.cpp:336
+#: clientgui/DlgItemProperties.cpp:365
 msgid "Report deadline"
 msgstr "Data límit per informar"
 
-#: DlgItemProperties.cpp:338
+#: clientgui/DlgItemProperties.cpp:367
 msgid "Resources"
 msgstr "Recursos"
 
-#: DlgItemProperties.cpp:341
+#: clientgui/DlgItemProperties.cpp:370
 msgid "Estimated computation size"
 msgstr "Càlcul estimat de computació"
 
-#: DlgItemProperties.cpp:344
+#: clientgui/DlgItemProperties.cpp:373
 msgid "CPU time at last checkpoint"
 msgstr "Temps de CPU en el darrer punt de control"
 
-#: DlgItemProperties.cpp:345 DlgItemProperties.cpp:360
+#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
 msgid "CPU time"
 msgstr "Temps de CPU"
 
-#: DlgItemProperties.cpp:347 DlgItemProperties.cpp:361
+#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
 msgid "Elapsed time"
 msgstr "Temps transcorregut"
 
-#: DlgItemProperties.cpp:349
+#: clientgui/DlgItemProperties.cpp:378
 msgid "Estimated time remaining"
 msgstr "Temps estimat que resta"
 
-#: DlgItemProperties.cpp:350
+#: clientgui/DlgItemProperties.cpp:379
 msgid "Fraction done"
 msgstr "Fracció realitzada"
 
-#: DlgItemProperties.cpp:351
+#: clientgui/DlgItemProperties.cpp:380
 msgid "Virtual memory size"
 msgstr "Grandària de la memòria virtual"
 
-#: DlgItemProperties.cpp:352
+#: clientgui/DlgItemProperties.cpp:381
 msgid "Working set size"
 msgstr "Grandària del bloc de treball"
 
-#: DlgItemProperties.cpp:354
+#: clientgui/DlgItemProperties.cpp:383
 msgid "Directory"
 msgstr "Directori"
 
-#: DlgItemProperties.cpp:357
+#: clientgui/DlgItemProperties.cpp:386
 msgid "Process ID"
 msgstr "ID del procés"
 
-#: DlgItemProperties.cpp:427 ViewWork.cpp:1032 sg_TaskPanel.cpp:823
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
 msgid "Local: "
 msgstr "Local: "
 
-#: DlgOptions.cpp:129 DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
 msgid "Options"
 msgstr "Opcions"
 
-#: DlgOptions.cpp:175
+#: clientgui/DlgOptions.cpp:178
 msgid "Language:"
 msgstr "Idioma:"
 
-#: DlgOptions.cpp:182
+#: clientgui/DlgOptions.cpp:185
 msgid "What language should BOINC use?"
 msgstr "Quin idioma ha d'utilitzar BOINC?"
 
-#: DlgOptions.cpp:186
+#: clientgui/DlgOptions.cpp:189
 msgid "Notice reminder interval:"
 msgstr "Interval recordatori de notificacions:"
 
-#: DlgOptions.cpp:193
+#: clientgui/DlgOptions.cpp:196
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Quants cops ha de recordar-li BOINC les notícies noves?"
 
-#: DlgOptions.cpp:198
+#: clientgui/DlgOptions.cpp:201
 msgid "Run Manager at login?"
 msgstr "Executar l'administrador en iniciar?"
 
-#: DlgOptions.cpp:204
+#: clientgui/DlgOptions.cpp:207
 msgid "Run the BOINC Manager when you log on."
 msgstr "Executar l'administrador BOINC quan s'identifiqui en el sistema."
 
-#: DlgOptions.cpp:209
+#: clientgui/DlgOptions.cpp:212
 msgid "Enable Manager exit dialog?"
 msgstr "Activar el diàleg de sortida de l'administrador?"
 
-#: DlgOptions.cpp:215
+#: clientgui/DlgOptions.cpp:218
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Mostrar el diàleg de sortida en finalitzar l'administrador."
 
-#: DlgOptions.cpp:226
+#: clientgui/DlgOptions.cpp:229
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Paràmetres de trucada i Xarxa Privada Virtual"
 
-#: DlgOptions.cpp:240
+#: clientgui/DlgOptions.cpp:243
 msgid "&Set Default"
 msgstr "&Aplicar valors per defecte"
 
-#: DlgOptions.cpp:245
+#: clientgui/DlgOptions.cpp:248
 msgid "&Clear Default"
 msgstr "&Netejar valors per defecte"
 
-#: DlgOptions.cpp:252
+#: clientgui/DlgOptions.cpp:255
 msgid "Default Connection:"
 msgstr "Connexió per defecte:"
 
-#: DlgOptions.cpp:259
+#: clientgui/DlgOptions.cpp:262
 msgid "Connections"
 msgstr "Connexions"
 
-#: DlgOptions.cpp:268
+#: clientgui/DlgOptions.cpp:271
 msgid "Connect via HTTP proxy server"
 msgstr "Connectar utilitzant un servidor proxy HTTP"
 
-#: DlgOptions.cpp:272
+#: clientgui/DlgOptions.cpp:275
 msgid "HTTP Proxy Server Configuration"
 msgstr "Configuració del Servidor Proxy HTTP"
 
-#: DlgOptions.cpp:280 DlgOptions.cpp:344
+#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
 msgid "Address:"
 msgstr "Adreça:"
 
-#: DlgOptions.cpp:288 DlgOptions.cpp:352 ProxyPage.cpp:340 ProxyPage.cpp:360
+#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: DlgOptions.cpp:296 DlgOptions.cpp:360
+#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
 msgid "Don't use proxy for:"
 msgstr "No utilitzar un proxy per:"
 
-#: DlgOptions.cpp:303 DlgOptions.cpp:367
+#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
 msgid "Leave these blank if not needed"
 msgstr "Deixar en blanc si no es necessita"
 
-#: DlgOptions.cpp:309 DlgOptions.cpp:373 ProxyPage.cpp:343 ProxyPage.cpp:363
+#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Nom d'usuari:"
 
-#: DlgOptions.cpp:317 DlgOptions.cpp:381 DlgSelectComputer.cpp:152
-#: ProxyPage.cpp:346 ProxyPage.cpp:366
+#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
+#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
+#: clientgui/ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: DlgOptions.cpp:324
+#: clientgui/DlgOptions.cpp:327
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
-#: DlgOptions.cpp:332
+#: clientgui/DlgOptions.cpp:335
 msgid "Connect via SOCKS proxy server"
 msgstr "Connectar utilitzant un servidor proxy SOCKS"
 
-#: DlgOptions.cpp:336
+#: clientgui/DlgOptions.cpp:339
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Configuració del Servidor Proxy SOCKS"
 
-#: DlgOptions.cpp:388
+#: clientgui/DlgOptions.cpp:391
 msgid "SOCKS Proxy"
 msgstr "Proxy SOCKS"
 
-#: DlgOptions.cpp:586
+#: clientgui/DlgOptions.cpp:589
 msgid "always"
 msgstr "sempre"
 
-#: DlgOptions.cpp:587
+#: clientgui/DlgOptions.cpp:590
 msgid "1 hour"
 msgstr "1 hora"
 
-#: DlgOptions.cpp:588
+#: clientgui/DlgOptions.cpp:591
 msgid "6 hours"
 msgstr "6 hores"
 
-#: DlgOptions.cpp:589
+#: clientgui/DlgOptions.cpp:592
 msgid "1 day"
 msgstr "1 dia"
 
-#: DlgOptions.cpp:590
+#: clientgui/DlgOptions.cpp:593
 msgid "1 week"
 msgstr "1 setmana"
 
-#: DlgOptions.cpp:591
+#: clientgui/DlgOptions.cpp:594
 msgid "never"
 msgstr "mai"
 
-#: DlgOptions.cpp:688
+#: clientgui/DlgOptions.cpp:691
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Selecció d'idioma"
 
-#: DlgOptions.cpp:695
+#: 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."
 msgstr "L'idioma de %s ha estat canviat.  Per tal de que el canvi tingui efecte, heu de tornar a iniciar %s."
 
-#: DlgSelectComputer.cpp:91
+#: clientgui/DlgSelectComputer.cpp:91
 #, c-format
 msgid "%s - Select Computer"
 msgstr "%s - Seleccionar un Ordinador"
 
-#: DlgSelectComputer.cpp:125
+#: clientgui/DlgSelectComputer.cpp:125
 #, c-format
 msgid ""
 "Another instance of %s is already running \n"
 "on this computer.  Please select a client to monitor."
 msgstr "Una altra instància de %s ja s'està executant \nen aquest equip.  Si us plau, seleccioneu un client per controlar-la."
 
-#: DlgSelectComputer.cpp:143
+#: clientgui/DlgSelectComputer.cpp:143
 msgid "Host name:"
 msgstr "Nom ordinador:"
 
-#: Localization.cpp:31 Localization.cpp:69
+#: clientgui/Localization.cpp:31 clientgui/Localization.cpp:69
 msgid "Message boards"
 msgstr "Taulers de missatges"
 
-#: Localization.cpp:33
+#: clientgui/Localization.cpp:33
 msgid "Correspond with other users on the SETI at home message boards"
 msgstr "Correspondència amb altres usuaris en els taulers de missatges de SETI at home"
 
-#: Localization.cpp:37
+#: clientgui/Localization.cpp:37
 msgid "Ask questions and report problems"
 msgstr "Feu preguntes i informeu dels problemes"
 
-#: Localization.cpp:39 Localization.cpp:81 Localization.cpp:111
-#: Localization.cpp:129
+#: clientgui/Localization.cpp:39 clientgui/Localization.cpp:81
+#: clientgui/Localization.cpp:111 clientgui/Localization.cpp:129
 msgid "Your account"
 msgstr "El vostre compte"
 
-#: Localization.cpp:41 Localization.cpp:87 Localization.cpp:113
+#: clientgui/Localization.cpp:41 clientgui/Localization.cpp:87
+#: clientgui/Localization.cpp:113
 msgid "View your account information and credit totals"
 msgstr "Veure la informació del seu compte i crèdits totals"
 
-#: Localization.cpp:43
+#: clientgui/Localization.cpp:43
 msgid "Your preferences"
 msgstr "Les seves preferències"
 
-#: Localization.cpp:45
+#: clientgui/Localization.cpp:45
 msgid "View and modify your SETI at home account profile and preferences"
 msgstr "Veure i modificar el perfil i preferències del seu compte a SETI at home"
 
-#: Localization.cpp:47 Localization.cpp:89
+#: clientgui/Localization.cpp:47 clientgui/Localization.cpp:89
 msgid "Your results"
 msgstr "Els seus resultats"
 
-#: Localization.cpp:49 Localization.cpp:91
+#: clientgui/Localization.cpp:49 clientgui/Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
 msgstr "Veure la seva darrera setmana (o més) de resultats i treballs de computació"
 
-#: Localization.cpp:51 Localization.cpp:93
+#: clientgui/Localization.cpp:51 clientgui/Localization.cpp:93
 msgid "Your computers"
 msgstr "Els seus ordinadors"
 
-#: Localization.cpp:53
+#: clientgui/Localization.cpp:53
 msgid "View a listing of all the computers on which you are running SETI at Home"
 msgstr "Veure la llista de tots els ordinadors en els que vostè està executant SETI at Home"
 
-#: Localization.cpp:55 Localization.cpp:97
+#: clientgui/Localization.cpp:55 clientgui/Localization.cpp:97
 msgid "Your team"
 msgstr "El seu equip"
 
-#: Localization.cpp:57 Localization.cpp:99
+#: clientgui/Localization.cpp:57 clientgui/Localization.cpp:99
 msgid "View information about your team"
 msgstr "Veure la informació sobre el seu equip"
 
-#: Localization.cpp:61
+#: clientgui/Localization.cpp:61
 msgid "Common questions"
 msgstr "Preguntes freqüents"
 
-#: Localization.cpp:63
+#: clientgui/Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
 msgstr "Llegeixi la llista de preguntes freqüents de Einstein at Home"
 
-#: Localization.cpp:65
+#: clientgui/Localization.cpp:65
 msgid "Screensaver info"
 msgstr "Informació del salva pantalles"
 
-#: Localization.cpp:67
+#: clientgui/Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr "Llegeixi una descripció detallada del salva pantalles de Einstein at Home"
 
-#: Localization.cpp:71
+#: clientgui/Localization.cpp:71
 msgid ""
 "Correspond with admins and other users on the Einstein at Home message boards"
 msgstr "Correspondència amb els administradors i altres usuaris en el taulers de missatges de Einstein at Home"
 
-#: Localization.cpp:73
+#: clientgui/Localization.cpp:73
 msgid "Einstein status"
 msgstr "Estat de Einstein"
 
-#: Localization.cpp:75
+#: clientgui/Localization.cpp:75
 msgid "Current status of the Einstein at Home server"
 msgstr "Estat actual del servidor de Einstein at Home"
 
-#: Localization.cpp:77
+#: clientgui/Localization.cpp:77
 msgid "Report problems"
 msgstr "Informar de problemes"
 
-#: Localization.cpp:79
+#: clientgui/Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
 msgstr "Enllaç al tauler de missatges de problemes i errors de Einstein at Home"
 
-#: Localization.cpp:83
+#: clientgui/Localization.cpp:83
 msgid "View and modify your Einstein at Home account profile and preferences"
 msgstr "Veure i modificar el perfil i preferències del seu compte a Einstein at Home"
 
-#: Localization.cpp:85
+#: clientgui/Localization.cpp:85
 msgid "Account summary"
 msgstr "Resum del compte"
 
-#: Localization.cpp:95
+#: clientgui/Localization.cpp:95
 msgid ""
 "View a listing of all the computers on which you are running Einstein at Home"
 msgstr "Veure la llista de tots els ordinadors en els que vostè està executant Einstein at Home"
 
-#: Localization.cpp:101
+#: clientgui/Localization.cpp:101
 msgid "LIGO project"
 msgstr "Projecte LIGO"
 
-#: Localization.cpp:103
+#: clientgui/Localization.cpp:103
 msgid ""
 "The home page of the Laser Interferometer Gravitational-wave Observatory "
 "(LIGO) project"
 msgstr "Pàgina del projecte Observatori de Interferometria d'Ones Gravitacionals (LIGO)"
 
-#: Localization.cpp:105
+#: clientgui/Localization.cpp:105
 msgid "GEO-600 project"
 msgstr "Projecte GEO-600"
 
-#: Localization.cpp:107
+#: clientgui/Localization.cpp:107
 msgid "The home page of the GEO-600 project"
 msgstr "Pàgina del projecte GEO-600"
 
-#: Localization.cpp:115 Localization.cpp:133 ViewProjects.cpp:221
-#: ViewStatistics.cpp:465
+#: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
+#: clientgui/ViewProjects.cpp:247 clientgui/ViewStatistics.cpp:441
 msgid "Team"
 msgstr "Equip"
 
-#: Localization.cpp:117
+#: clientgui/Localization.cpp:117
 msgid "Info about your Team"
 msgstr "Informació respecte de l'equip"
 
-#: Localization.cpp:123
+#: clientgui/Localization.cpp:123
 msgid "Get help for climateprediction.net"
 msgstr "Obtingui ajuda per a climateprediction.net"
 
-#: Localization.cpp:125
+#: clientgui/Localization.cpp:125
 msgid "News"
 msgstr "Novetats"
 
-#: Localization.cpp:127
+#: clientgui/Localization.cpp:127
 msgid "climateprediction.net News"
 msgstr "Novetats de climateprediction.net"
 
-#: Localization.cpp:131
+#: clientgui/Localization.cpp:131
 msgid "View your account information, credits, and trickles"
 msgstr "Veure la informació del seu compte, crèdits i preguntes"
 
-#: Localization.cpp:135
+#: clientgui/Localization.cpp:135
 msgid "Info about your team"
 msgstr "Informació respecte al seu equip"
 
-#: Localization.cpp:141
+#: clientgui/Localization.cpp:141
 msgid "Search for help in our help system"
 msgstr "Cercar ajuda en el nostre sistema d'ajuda"
 
-#: Localization.cpp:143
+#: clientgui/Localization.cpp:143
 msgid "Global Statistics"
 msgstr "Estadístiques Globals"
 
-#: Localization.cpp:145
+#: clientgui/Localization.cpp:145
 msgid "Summary statistics for World Community Grid"
 msgstr "Resum estadístiques de World Community Grid"
 
-#: Localization.cpp:147
+#: clientgui/Localization.cpp:147
 msgid "My Grid"
 msgstr "La meva graella"
 
-#: Localization.cpp:149
+#: clientgui/Localization.cpp:149
 msgid "Your statistics and settings"
 msgstr "Les seves estadístiques i paràmetres"
 
-#: Localization.cpp:151
+#: clientgui/Localization.cpp:151
 msgid "Device Profiles"
 msgstr "Perfils de Dispositius"
 
-#: Localization.cpp:153
+#: clientgui/Localization.cpp:153
 msgid "Update your device settings"
 msgstr "Actualitzar els paràmetres dels seus dispositius"
 
-#: Localization.cpp:155
+#: clientgui/Localization.cpp:155
 msgid "Research"
 msgstr "Recerca"
 
-#: Localization.cpp:157
+#: clientgui/Localization.cpp:157
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Aprendre respecte del projectes controlats per la World Community Grid"
 
-#: MainDocument.cpp:583
+#: clientgui/MainDocument.cpp:583
 msgid "Starting client"
 msgstr "Iniciant client"
 
-#: MainDocument.cpp:591
+#: clientgui/MainDocument.cpp:591
 msgid "Connecting to client"
 msgstr "Connectant amb el client"
 
-#: MainDocument.cpp:1195
+#: clientgui/MainDocument.cpp:1205
 msgid "Retrieving system state; please wait..."
 msgstr "Recuperant l'estat del sistema; esperi si us plau..."
 
-#: MainDocument.cpp:1816
+#: clientgui/MainDocument.cpp:1826
 msgid "Missing application"
 msgstr "Manca l'aplicació"
 
-#: MainDocument.cpp:1817
+#: clientgui/MainDocument.cpp:1827
 msgid ""
 "Please download and install the CoRD application from "
 "http://cord.sourceforge.net"
 msgstr "Si us plau, descarregueu i instal l'aplicació CoRD des de http://cord.sourceforge.net"
 
-#: MainDocument.cpp:2432
+#: clientgui/MainDocument.cpp:2442
 msgid "on batteries"
 msgstr "en bateries"
 
-#: MainDocument.cpp:2433
+#: clientgui/MainDocument.cpp:2443
 msgid "computer is in use"
 msgstr "l'ordinador està en us"
 
-#: MainDocument.cpp:2434
+#: clientgui/MainDocument.cpp:2444
 msgid "user request"
 msgstr "sol.licitud de l'usuari"
 
-#: MainDocument.cpp:2435
+#: clientgui/MainDocument.cpp:2445
 msgid "time of day"
 msgstr "hora del dia"
 
-#: MainDocument.cpp:2436
+#: clientgui/MainDocument.cpp:2446
 msgid "CPU benchmarks in progress"
 msgstr "Test de la CPU en progrés"
 
-#: MainDocument.cpp:2437
+#: clientgui/MainDocument.cpp:2447
 msgid "need disk space - check preferences"
 msgstr "necessitat d'espai en disc - comprovar les preferències"
 
-#: MainDocument.cpp:2438
+#: clientgui/MainDocument.cpp:2448
 msgid "computer is not in use"
 msgstr "l'ordinador no està en us"
 
-#: MainDocument.cpp:2439
+#: clientgui/MainDocument.cpp:2449
 msgid "starting up"
 msgstr "iniciant"
 
-#: MainDocument.cpp:2440
+#: clientgui/MainDocument.cpp:2450
 msgid "an exclusive app is running"
 msgstr "s'està executant una aplicació amb exclusivitat"
 
-#: MainDocument.cpp:2441
+#: clientgui/MainDocument.cpp:2451
 msgid "CPU is busy"
 msgstr "La CPU està ocupada"
 
-#: MainDocument.cpp:2442
+#: clientgui/MainDocument.cpp:2452
 msgid "network bandwidth limit exceeded"
 msgstr "s'ha superat el límit d'ample de banda"
 
-#: MainDocument.cpp:2443
+#: clientgui/MainDocument.cpp:2453
 msgid "requested by operating system"
 msgstr "sol·licitat pel sistema operatiu"
 
-#: MainDocument.cpp:2445
+#: clientgui/MainDocument.cpp:2455
 msgid "unknown reason"
 msgstr "raó desconeguda"
 
-#: MainDocument.cpp:2467
+#: clientgui/MainDocument.cpp:2477
 msgid "GPU missing, "
 msgstr "GPU inexistent, "
 
-#: MainDocument.cpp:2474
+#: clientgui/MainDocument.cpp:2484
 msgid "New"
 msgstr "Nou"
 
-#: MainDocument.cpp:2478
+#: clientgui/MainDocument.cpp:2488
 msgid "Download failed"
 msgstr "La descàrrega ha fallat"
 
-#: MainDocument.cpp:2480
+#: clientgui/MainDocument.cpp:2490
 msgid "Downloading"
 msgstr "Descarregant"
 
-#: MainDocument.cpp:2482 MainDocument.cpp:2552
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr " (suspès - "
 
-#: MainDocument.cpp:2490
+#: clientgui/MainDocument.cpp:2500
 msgid "Project suspended by user"
 msgstr "Projecte suspès per l'usuari"
 
-#: MainDocument.cpp:2492
+#: clientgui/MainDocument.cpp:2502
 msgid "Task suspended by user"
 msgstr "Tasca suspesa per l'usuari"
 
-#: MainDocument.cpp:2494
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
+#: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Suspès - "
 
-#: MainDocument.cpp:2500
+#: clientgui/MainDocument.cpp:2510
 msgid "GPU suspended - "
 msgstr "GPU suspesa - "
 
-#: MainDocument.cpp:2507
+#: clientgui/MainDocument.cpp:2514
 msgid "Waiting for memory"
 msgstr "Esperant memòria"
 
-#: MainDocument.cpp:2509
+#: clientgui/MainDocument.cpp:2516
 msgid "Waiting for shared memory"
 msgstr "Esperant memòria compartida"
 
-#: MainDocument.cpp:2512
-msgid "Running, high priority"
-msgstr "Executant, alta prioritat"
-
-#: MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2518
 msgid "Running"
 msgstr "Executant"
 
-#: MainDocument.cpp:2517
+#: clientgui/MainDocument.cpp:2520
 msgid " (non-CPU-intensive)"
 msgstr " (no-CPU-intensiva)"
 
-#: MainDocument.cpp:2520
+#: clientgui/MainDocument.cpp:2523
 msgid "Waiting to run"
 msgstr "Esperant per executar"
 
-#: MainDocument.cpp:2522 MainDocument.cpp:2528
+#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
 msgid "Ready to start"
 msgstr "A punt per començar"
 
-#: MainDocument.cpp:2532
-msgid " (Scheduler wait: "
-msgstr " (Espera del programador: "
+#: clientgui/MainDocument.cpp:2532
+msgid "Postponed: "
+msgstr "Posposat:"
 
-#: MainDocument.cpp:2536
-msgid " (Scheduler wait)"
-msgstr " (Espera del programador)"
+#: clientgui/MainDocument.cpp:2535
+msgid "Postponed"
+msgstr "Posposat"
 
-#: MainDocument.cpp:2540
-msgid " (Waiting for network access)"
-msgstr " (Esperant accés a la xarxa)"
+#: clientgui/MainDocument.cpp:2539
+msgid "Waiting for network access"
+msgstr "Esperant per accés a la xarxa"
 
-#: MainDocument.cpp:2544
+#: clientgui/MainDocument.cpp:2543
 msgid "Computation error"
 msgstr "Error de computació"
 
-#: MainDocument.cpp:2548
+#: clientgui/MainDocument.cpp:2547
 msgid "Upload failed"
 msgstr "La càrrega ha fallat"
 
-#: MainDocument.cpp:2550
+#: clientgui/MainDocument.cpp:2549
 msgid "Uploading"
 msgstr "Carregant"
 
-#: MainDocument.cpp:2561
+#: clientgui/MainDocument.cpp:2560
 msgid "Aborted by user"
 msgstr "Avortat per l'usuari"
 
-#: MainDocument.cpp:2564
+#: clientgui/MainDocument.cpp:2563
 msgid "Aborted by project"
 msgstr "Avortat per el projecte"
 
-#: MainDocument.cpp:2567
+#: clientgui/MainDocument.cpp:2566
 msgid "Aborted: not started by deadline"
 msgstr "Avortat: no s'ha iniciat per haver superat el de temps de finalització"
 
-#: MainDocument.cpp:2570
+#: clientgui/MainDocument.cpp:2569
 msgid "Aborted: disk limit exceeded"
 msgstr "Avortat: s'ha superat el límit d'espai en disc"
 
-#: MainDocument.cpp:2573
+#: clientgui/MainDocument.cpp:2572
 msgid "Aborted: run time limit exceeded"
 msgstr "Avortat: s'ha superat el temps límit d'execució"
 
-#: MainDocument.cpp:2576
+#: clientgui/MainDocument.cpp:2575
 msgid "Aborted: memory limit exceeded"
 msgstr "Avortat: s'ha superat el límit de memòria"
 
-#: MainDocument.cpp:2579
+#: clientgui/MainDocument.cpp:2578
 msgid "Aborted"
 msgstr "Avortat"
 
-#: MainDocument.cpp:2584
+#: clientgui/MainDocument.cpp:2583
 msgid "Acknowledged"
 msgstr "Reconegut"
 
-#: MainDocument.cpp:2586
+#: clientgui/MainDocument.cpp:2585
 msgid "Ready to report"
 msgstr "A punt per informar"
 
-#: MainDocument.cpp:2588
+#: clientgui/MainDocument.cpp:2587
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Error: estat incorrecte '%d'"
 
-#: NoInternetConnectionPage.cpp:179
+#: clientgui/NoInternetConnectionPage.cpp:179
 msgid "No Internet connection"
 msgstr "No hi ha connexió a Internet"
 
-#: NoInternetConnectionPage.cpp:182
+#: clientgui/NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
 msgstr "Si us plau connecti's a Internet i provi-ho de nou."
 
-#: NotDetectedPage.cpp:181
+#: clientgui/NotDetectedPage.cpp:181
 msgid "Project not found"
 msgstr "Projecte no trobat"
 
-#: NotDetectedPage.cpp:184
+#: clientgui/NotDetectedPage.cpp:184
 msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
 "Please check the URL and try again."
 msgstr "La URL que ha subministrat no es correspon amb un projecte basat en BOINC.\n\nSi us plau verifiqui la URL i provi-ho de nou."
 
-#: NotDetectedPage.cpp:188
+#: clientgui/NotDetectedPage.cpp:188
 msgid "Account manager not found"
 msgstr "Administrador de comptes no trobat"
 
-#: NotDetectedPage.cpp:191
+#: clientgui/NotDetectedPage.cpp:191
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -2379,99 +2648,140 @@ msgid ""
 "Please check the URL and try again."
 msgstr "La URL que ha subministrat no es correspon amb un compte basat en un\nadministrador BOINC.\n\nSi us plau verifiqui la URL i provi-ho de nou."
 
-#: NotFoundPage.cpp:181
+#: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
 msgstr "Ha Fallat la Identificació."
 
-#: NotFoundPage.cpp:185
+#: clientgui/NotFoundPage.cpp:185
 msgid "Check the username and password, and try again."
 msgstr "Verifiqui el nom d'usuari i contrasenya, i provi-ho de nou."
 
-#: NotFoundPage.cpp:189
+#: clientgui/NotFoundPage.cpp:189
 msgid "Check the email address and password, and try again."
 msgstr "Verifiqui l'adreça de correu electrònic i contrasenya, i provi-ho de nou."
 
-#: NoticeListCtrl.cpp:222
+#: clientgui/NoticeListCtrl.cpp:229
 msgid "more..."
 msgstr "més..."
 
-#: ProjectInfoPage.cpp:477 ProjectInfoPage.cpp:778 ProjectInfoPage.cpp:782
-msgid "All"
-msgstr "Tot"
-
-#: ProjectInfoPage.cpp:615
+#: clientgui/ProjectInfoPage.cpp:221
 msgid "Choose a project"
 msgstr "Esculli un projecte"
 
-#: ProjectInfoPage.cpp:619
+#: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
 msgstr "Per escollir un projecte, premi el seu nom o introdueixi la seva URL a continuació."
 
-#: ProjectInfoPage.cpp:623
+#: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "Catagories:"
 
-#: ProjectInfoPage.cpp:627 sg_ProjectPanel.cpp:89
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projectes:"
 
-#: ProjectInfoPage.cpp:631
+#: clientgui/ProjectInfoPage.cpp:274
 msgid "Project details"
 msgstr "Detalls del projecte"
 
-#: ProjectInfoPage.cpp:635
+#: clientgui/ProjectInfoPage.cpp:284
 msgid "Research area:"
 msgstr "Àrea de recerca:"
 
-#: ProjectInfoPage.cpp:639
+#: clientgui/ProjectInfoPage.cpp:294
 msgid "Organization:"
 msgstr "Organització:"
 
-#: ProjectInfoPage.cpp:643
+#: clientgui/ProjectInfoPage.cpp:304
 msgid "Web site:"
 msgstr "Pàgina web:"
 
-#: ProjectInfoPage.cpp:647
+#: clientgui/ProjectInfoPage.cpp:315
 msgid "Supported systems:"
 msgstr "Sistemes compatibles:"
 
-#: ProjectInfoPage.cpp:651
+#: clientgui/ProjectInfoPage.cpp:352
 msgid "Project URL:"
 msgstr "&URL del projecte:"
 
-#: ProjectInfoPage.cpp:826
+#: clientgui/ProjectInfoPage.cpp:486 clientgui/ProjectInfoPage.cpp:686
+#: clientgui/ProjectInfoPage.cpp:690
+msgid "All"
+msgstr "Tot"
+
+#: clientgui/ProjectInfoPage.cpp:735
 msgid ""
 "This project may not have work for your type of computer.  Do you want to "
 "add it anyway?"
 msgstr "Aquest projecte poder no te feina per al seu ordinador.  Vol afegir-lo de totes maneres?"
 
-#: ProjectInfoPage.cpp:850
+#: clientgui/ProjectInfoPage.cpp:767
 msgid "You already added this project. Please choose a different project."
 msgstr "Ja va afegir aquest projecte. Si us plau esculli un projecte diferent."
 
-#: ProjectProcessingPage.cpp:321
+#: clientgui/ProjectProcessingPage.cpp:321
 msgid "Communicating with project."
 msgstr "Establint comunicació amb el servidor."
 
-#: ProjectProcessingPage.cpp:509
+#: clientgui/ProjectProcessingPage.cpp:509
 msgid "Required files not found on the server."
 msgstr "Els fitxers sol·licitats no s'han trobat en el servidor."
 
-#: ProjectProcessingPage.cpp:512 ProjectProcessingPage.cpp:574
+#: clientgui/ProjectProcessingPage.cpp:512
+#: clientgui/ProjectProcessingPage.cpp:585
 msgid "An internal server error has occurred."
 msgstr "Ha ocorregut un error intern del servidor."
 
-#: ProjectPropertiesPage.cpp:334
+#: clientgui/ProjectPropertiesPage.cpp:334
 msgid ""
 "Communicating with project\n"
 "Please wait..."
 msgstr "Comunicant amb el projecte\nSi us plau, esperi..."
 
-#: ProxyInfoPage.cpp:195
+#: clientgui/ProjectWelcomePage.cpp:251
+#, c-format
+msgid "Welcome to %s."
+msgstr "Benvingut a %s."
+
+#: clientgui/ProjectWelcomePage.cpp:254
+msgid "You have volunteered to compute for this project:"
+msgstr "T'has ofert a calcular per a aquest projecte:"
+
+#: clientgui/ProjectWelcomePage.cpp:255
+msgid "Name:"
+msgstr "Nom:"
+
+#: clientgui/ProjectWelcomePage.cpp:258
+msgid "Home:"
+msgstr "Inici:"
+
+#: clientgui/ProjectWelcomePage.cpp:262
+msgid "Description:"
+msgstr "Descripció:"
+
+#: clientgui/ProjectWelcomePage.cpp:265
+msgid "URL:"
+msgstr "URL:"
+
+#: clientgui/ProjectWelcomePage.cpp:268
+msgid "User:"
+msgstr "Usuari:"
+
+#: clientgui/ProjectWelcomePage.cpp:273
+msgid ""
+"WARNING: This project is not registered with BOINC.  Make sure you trust it "
+"before continuing."
+msgstr "ATENCIÓ: Aquest projecte no està registrat a BOINC. Estigues segur que hi confies abans de continuar."
+
+#: clientgui/ProjectWelcomePage.cpp:277
+msgid "To continue, click Next."
+msgstr "Per continuar, prémer Següent."
+
+#: clientgui/ProxyInfoPage.cpp:195
 msgid "Network communication failure"
 msgstr "Fallo en la comunicació per xarxa"
 
-#: ProxyInfoPage.cpp:199
+#: clientgui/ProxyInfoPage.cpp:199
 msgid ""
 "The World Community Grid - BOINC software failed to communicate\n"
 "over the Internet. The most likely reasons are:\n"
@@ -2488,7 +2798,7 @@ msgid ""
 "Click Next to configure BOINC's proxy settings."
 msgstr "The World Community Grid - BOINC no ha pogut establir comunicació\nper Internet. Les raons més probables son:\n\n1) Problema de connectivitat.  Verifiqueu la vostra xarxa o la connexió per mòdem\ni després premeu Enrere per intentar-ho de nou.\n\n2) El programa tallafocs està bloquejant el programa The World Community\nGrid - BOINC.  Configureu el programa tallafocs per permetre\nque BOINC i BOINC-Manager comuniquin per el port 80 i el port 443,\ndesprés premeu Enrere per intenta [...]
 
-#: ProxyInfoPage.cpp:203
+#: clientgui/ProxyInfoPage.cpp:203
 msgid ""
 "BOINC failed to communicate on the Internet.\n"
 "The most likely reasons are:\n"
@@ -2505,611 +2815,618 @@ msgid ""
 "Click Next to configure BOINC's proxy settings."
 msgstr "BOINC no ha pogut comunicar per Internet.\nLes raons més probables son:\n\n1) Problema de connectivitat.  Verifiqueu la vostra xarxa\no la connexió per mòdem i premeu Enrere per intentar-ho de nou.\n\n2) El programa tallafocs està bloquejant BOINC.\nConfigureu el programa tallafocs per permetre que BOINC i\nl'Administrador BOINC comuniquin per el port 80,\ndesprés premeu Enrere per intentar-ho de nou.\n\n3) Esteu fent servir un servidor proxy.\nPremeu Següent per configurar els p [...]
 
-#: ProxyPage.cpp:331
+#: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
 msgstr "Configuració del proxy"
 
-#: ProxyPage.cpp:334
+#: clientgui/ProxyPage.cpp:334
 msgid "HTTP proxy"
 msgstr "Proxy HTTP"
 
-#: ProxyPage.cpp:337 ProxyPage.cpp:357
+#: clientgui/ProxyPage.cpp:337 clientgui/ProxyPage.cpp:357
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ProxyPage.cpp:350
+#: clientgui/ProxyPage.cpp:350
 msgid "Autodetect"
 msgstr "Auto detectar"
 
-#: ProxyPage.cpp:354
+#: clientgui/ProxyPage.cpp:354
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy"
 
-#: TermsOfUsePage.cpp:218
+#: clientgui/TermsOfUsePage.cpp:218
 msgid "Terms of Use"
 msgstr "Condicions d'ús"
 
-#: TermsOfUsePage.cpp:222
+#: clientgui/TermsOfUsePage.cpp:222
 msgid "Please read the following terms of use:"
 msgstr "Si us plau, llegeixi les següents condicions d'ús:"
 
-#: TermsOfUsePage.cpp:231
+#: clientgui/TermsOfUsePage.cpp:231
 msgid "I agree to the terms of use."
 msgstr "Accepto les condicions d'ús."
 
-#: TermsOfUsePage.cpp:237
+#: clientgui/TermsOfUsePage.cpp:237
 msgid "I do not agree to the terms of use."
 msgstr "No accepto les condicions d'ús."
 
-#: UnavailablePage.cpp:183
+#: clientgui/UnavailablePage.cpp:183
 msgid "Project temporarily unavailable"
 msgstr "Projecte temporalment no disponible"
 
-#: UnavailablePage.cpp:186
+#: clientgui/UnavailablePage.cpp:186
 msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
 "Please try again later."
 msgstr "El Projecte no està disponible temporalment.\n\nSi us plau, provi-ho mes tard."
 
-#: UnavailablePage.cpp:190
+#: clientgui/UnavailablePage.cpp:190
 msgid "Account manager temporarily unavailable"
 msgstr "Administrador de comptes temporalment no disponible"
 
-#: UnavailablePage.cpp:193
+#: clientgui/UnavailablePage.cpp:193
 msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
 "Please try again later."
 msgstr "L'administrador de comptes no està disponible temporalment.\n\nSi us plau, provi-ho mes tard."
 
-#: ValidateAccountKey.cpp:68
+#: clientgui/ValidateAccountKey.cpp:68
 msgid "Please specify an account key to continue."
 msgstr "Si us plau entri una clau de compte per continuar."
 
-#: ValidateAccountKey.cpp:71
+#: clientgui/ValidateAccountKey.cpp:71
 msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "Clau de Compte invàlida; si us plau entri una Clau de Compte vàlida"
 
-#: ValidateAccountKey.cpp:82 ValidateEmailAddress.cpp:86
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
 msgid "Validation conflict"
 msgstr "Verificació fallida"
 
-#: ValidateEmailAddress.cpp:72
+#: clientgui/ValidateEmailAddress.cpp:72
 msgid "Please specify an email address"
 msgstr "Si us plau entri el seu compte de correu"
 
-#: ValidateEmailAddress.cpp:75
+#: clientgui/ValidateEmailAddress.cpp:75
 msgid "Invalid email address; please enter a valid email address"
 msgstr "Compte de correu incorrecte; si us plau, introdueixi un compte de correu vàlid"
 
-#: ValidateURL.cpp:69
+#: clientgui/ValidateURL.cpp:69
 msgid "Missing URL"
 msgstr "Falta la URL"
 
-#: ValidateURL.cpp:70
+#: clientgui/ValidateURL.cpp:70
 msgid ""
 "Please specify a URL.\n"
 "For example:\n"
 "http://www.example.com/"
 msgstr "Si us plau especifiqui la URL.\nPer exemple:\nhttp://www.example.com/"
 
-#: ValidateURL.cpp:83 ValidateURL.cpp:87 ValidateURL.cpp:91
-#: ValidateURL.cpp:103 ValidateURL.cpp:107 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 "URL incorrecte"
 
-#: ValidateURL.cpp:84 ValidateURL.cpp:88 ValidateURL.cpp:92
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
 msgid ""
 "Please specify a valid URL.\n"
 "For example:\n"
 "http://boincproject.example.com"
 msgstr "Si us plau especifiqui la URL.\nPer exemple:\nhttp://boincproject.example.com"
 
-#: ValidateURL.cpp:104 ValidateURL.cpp:108
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "'%s' no conté un nom vàlid de d'ordinador."
 
-#: ValidateURL.cpp:111
+#: clientgui/ValidateURL.cpp:111
 #, c-format
 msgid "'%s' does not contain a valid path."
 msgstr "'%s' no conté una ruta vàlida."
 
-#: ViewMessages.cpp:84 ViewProjects.cpp:170 ViewStatistics.cpp:1978
-#: ViewTransfers.cpp:160 ViewWork.cpp:183
+#. 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 "Ordres"
 
-#: ViewMessages.cpp:88
+#: clientgui/ViewMessages.cpp:88
 msgid "Copy all messages"
 msgstr "Copiar tots els missatges"
 
-#: ViewMessages.cpp:95
+#: clientgui/ViewMessages.cpp:95
 msgid "Copy selected messages"
 msgstr "Copiar els missatges seleccionats"
 
-#: ViewMessages.cpp:106 ViewMessages.cpp:502
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
 msgid "Show only this project"
 msgstr "Mostrar només aquest projecte"
 
-#: ViewMessages.cpp:107 ViewMessages.cpp:503
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
 msgid "Show only the messages for the selected project."
 msgstr "Mostrar només el missatges del projecte seleccionat."
 
-#: ViewMessages.cpp:164
+#: clientgui/ViewMessages.cpp:164
 msgid "Messages"
 msgstr "Missatges"
 
-#: ViewMessages.cpp:187
+#: clientgui/ViewMessages.cpp:187
 msgid "Copying all messages to the clipboard..."
 msgstr "Copiar tots els missatges al porta papers..."
 
-#: ViewMessages.cpp:223
+#: clientgui/ViewMessages.cpp:223
 msgid "Copying selected messages to the clipboard..."
 msgstr "Copiant els missatges seleccionats al porta papers..."
 
-#: ViewMessages.cpp:286
+#: clientgui/ViewMessages.cpp:286
 msgid "Filtering messages..."
 msgstr "Filtrant missatges..."
 
-#: ViewMessages.cpp:494
+#: clientgui/ViewMessages.cpp:494
 msgid "Show all messages"
 msgstr "Mostrar tots els missatges"
 
-#: ViewMessages.cpp:495
+#: clientgui/ViewMessages.cpp:495
 msgid "Show messages for all projects."
 msgstr "Mostrar els missatges de tots els projectes."
 
-#: ViewNotices.cpp:58 sg_DlgMessages.cpp:124
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
 msgid "Fetching notices; please wait..."
 msgstr "Obtenint noticies, si us plau esperi..."
 
-#: ViewNotices.cpp:65 sg_DlgMessages.cpp:132
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
 msgid "There are no notices at this time."
 msgstr "No hi han notícies en aquest moment."
 
-#: ViewNotices.cpp:99 sg_BoincSimpleFrame.cpp:776
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
 msgid "Notices"
 msgstr "Notícies"
 
-#: ViewProjects.cpp:174 sg_ProjectCommandPopup.cpp:61
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
 msgstr "Actualitzar"
 
-#: ViewProjects.cpp:175 sg_ProjectCommandPopup.cpp:62
+#: 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 "Informar de totes les tasques finalitzades, obtenir els darrers crèdits, i possiblement obtenir noves tasques."
 
-#: ViewProjects.cpp:181 ViewProjects.cpp:722 ViewWork.cpp:208 ViewWork.cpp:801
-#: sg_BoincSimpleFrame.cpp:757 sg_ProjectCommandPopup.cpp:67
-#: sg_ProjectCommandPopup.cpp:113 sg_TaskCommandPopup.cpp:66
-#: sg_TaskCommandPopup.cpp:106
+#: 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"
 
-#: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
-#: sg_ProjectCommandPopup.cpp:114
+#: 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 "Suspendre les tasques d'aquest projecte."
 
-#: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
-#: sg_ProjectCommandPopup.cpp:121
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:821
+#: clientgui/sg_ProjectCommandPopup.cpp:78
+#: clientgui/sg_ProjectCommandPopup.cpp:136
 msgid "No new tasks"
 msgstr "No descarregar tasques noves"
 
-#: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "No obtenir noves tasques per aquest projecte."
 
-#: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "Reiniciar el projecte"
 
-#: ViewProjects.cpp:196 sg_ProjectCommandPopup.cpp:80
+#: 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 "Eliminar tots els fitxers i tasques associades amb aquest projecte, i obtenir tasques noves.  Abans podeu actualitzar el projecte per informar de les tasques finalitzades."
 
-#: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
+#: 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 "Eliminar aquest projecte.  Les tasques en execució es perdran (abans utilitzi 'Actualitzar' per informar de les tasques finalitzades)."
 
-#: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
-#: sg_TaskCommandPopup.cpp:78
+#: clientgui/ViewProjects.cpp:231 clientgui/ViewWork.cpp:246
+#: clientgui/sg_ProjectCommandPopup.cpp:96
+#: clientgui/sg_TaskCommandPopup.cpp:84
 msgid "Properties"
 msgstr "Propietats"
 
-#: ViewProjects.cpp:210 sg_ProjectCommandPopup.cpp:92
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr "Mostrar els detalls del projecte."
 
-#: ViewProjects.cpp:220 ViewStatistics.cpp:450
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "Compte"
 
-#: ViewProjects.cpp:222
+#: clientgui/ViewProjects.cpp:248
 msgid "Work done"
 msgstr "Feina finalitzada"
 
-#: ViewProjects.cpp:223
+#: clientgui/ViewProjects.cpp:249
 msgid "Avg. work done"
 msgstr "Mitjana de la feina realitzada"
 
-#: ViewProjects.cpp:225 ViewTransfers.cpp:188 ViewWork.cpp:234
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "Estat"
 
-#: ViewProjects.cpp:250
+#: clientgui/ViewProjects.cpp:330
 msgid "Projects"
 msgstr "Projectes"
 
-#: ViewProjects.cpp:302
+#: clientgui/ViewProjects.cpp:382
 msgid "Updating project..."
 msgstr "Actualitzant el projecte..."
 
-#: ViewProjects.cpp:344
+#: clientgui/ViewProjects.cpp:424
 msgid "Resuming project..."
 msgstr "Continuant el projecte..."
 
-#: ViewProjects.cpp:348
+#: clientgui/ViewProjects.cpp:428
 msgid "Suspending project..."
 msgstr "Suspenent el projecte..."
 
-#: ViewProjects.cpp:385
+#: clientgui/ViewProjects.cpp:465
 msgid "Telling project to allow additional task downloads..."
 msgstr "Informant al projecte que es poden descarregar noves tasques..."
 
-#: ViewProjects.cpp:389
+#: clientgui/ViewProjects.cpp:469
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Informant al projecte de no es volen descarregar noves tasques..."
 
-#: ViewProjects.cpp:425
+#: clientgui/ViewProjects.cpp:505
 msgid "Resetting project..."
 msgstr "Reiniciant el projecte..."
 
-#: ViewProjects.cpp:438 sg_ProjectCommandPopup.cpp:214
+#: clientgui/ViewProjects.cpp:518 clientgui/sg_ProjectCommandPopup.cpp:229
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Està segur que vol reiniciar el projecte '%s'?"
 
-#: ViewProjects.cpp:444 sg_ProjectCommandPopup.cpp:220
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:235
 msgid "Reset Project"
 msgstr "Reiniciar el Projecte"
 
-#: ViewProjects.cpp:483
+#: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "Eliminant el projecte..."
 
-#: ViewProjects.cpp:496 sg_ProjectCommandPopup.cpp:251
+#: clientgui/ViewProjects.cpp:576 clientgui/sg_ProjectCommandPopup.cpp:266
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Està segur que vol eliminar el projecte '%s'?"
 
-#: ViewProjects.cpp:502 sg_ProjectCommandPopup.cpp:257
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:272
 msgid "Remove Project"
 msgstr "Eliminar el Projecte"
 
-#: ViewProjects.cpp:543 ViewWork.cpp:599
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Activant el navegador..."
 
-#: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
 msgid "Resume tasks for this project."
 msgstr "Continuar les tasques d'aquest projecte."
 
-#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
 msgid "Allow new tasks"
 msgstr "Permetre noves tasques"
 
-#: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:134
 msgid "Allow fetching new tasks for this project."
 msgstr "Permetre l'obtenció de noves tasques per aquest projecte."
 
-#: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
+#: clientgui/ViewProjects.cpp:821 clientgui/sg_ProjectCommandPopup.cpp:137
 msgid "Don't fetch new tasks for this project."
 msgstr "No obtenir noves tasques per aquest projecte."
 
-#: ViewProjects.cpp:1058
+#: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Sol.licitat per l'usuari"
 
-#: ViewProjects.cpp:1059
+#: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
 msgstr "Per obtenir feina"
 
-#: ViewProjects.cpp:1060
+#: clientgui/ViewProjects.cpp:1142
 msgid "To report completed tasks"
 msgstr "Per informar sobre les tasques completades"
 
-#: ViewProjects.cpp:1061
+#: clientgui/ViewProjects.cpp:1143
 msgid "To send trickle-up message"
 msgstr "Per enviar un missatge"
 
-#: ViewProjects.cpp:1062
+#: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
 msgstr "Sol·licitat per l'administrador de comptes"
 
-#: ViewProjects.cpp:1063
+#: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
 msgstr "Inicialització del projecte"
 
-#: ViewProjects.cpp:1064
+#: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
 msgstr "Sol·licitat per el projecte"
 
-#: ViewProjects.cpp:1065
+#: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
 msgstr "Raó desconeguda"
 
-#: ViewProjects.cpp:1079
+#: clientgui/ViewProjects.cpp:1161
 msgid "Suspended by user"
 msgstr "Suspès per l'usuari"
 
-#: ViewProjects.cpp:1082
+#: clientgui/ViewProjects.cpp:1164
 msgid "Won't get new tasks"
 msgstr "No es desitgen noves tasques"
 
-#: ViewProjects.cpp:1085
+#: clientgui/ViewProjects.cpp:1167
 msgid "Project ended - OK to remove"
 msgstr "Projecte finalitzat - OK per eliminar-lo"
 
-#: ViewProjects.cpp:1088
+#: clientgui/ViewProjects.cpp:1170
 msgid "Will remove when tasks done"
 msgstr "S'eliminarà quan les tasques hagin finalitzat"
 
-#: ViewProjects.cpp:1091
+#: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
 msgstr "Petició programada en espera"
 
-#: ViewProjects.cpp:1097
+#: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
 msgstr "Petició programada en execució"
 
-#: ViewProjects.cpp:1100
+#: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
 msgstr "Degoteig de dades pendent"
 
-#: ViewProjects.cpp:1106
+#: clientgui/ViewProjects.cpp:1188
 msgid "Communication deferred "
 msgstr "Comunicació posposada "
 
-#: ViewResources.cpp:62
+#: clientgui/ViewResources.cpp:62
 msgid "Total disk usage"
 msgstr "Espai usat del total del disc"
 
-#: ViewResources.cpp:83
+#: clientgui/ViewResources.cpp:83
 msgid "Disk usage by BOINC projects"
 msgstr "Espai del disc usat per els projectes BOINC"
 
-#: ViewResources.cpp:116
-msgid "Disk"
-msgstr "Disc"
-
-#: ViewResources.cpp:249
+#: clientgui/ViewResources.cpp:225
 msgid "no projects: 0 bytes used"
 msgstr "cap projecte: 0 bytes utilitzats"
 
-#: ViewResources.cpp:286
+#: clientgui/ViewResources.cpp:259
 msgid "used by BOINC: "
 msgstr "utilitzat per BOINC: "
 
-#: ViewResources.cpp:296
+#: clientgui/ViewResources.cpp:269
 msgid "free, available to BOINC: "
 msgstr "lliure, disponible per BOINC: "
 
-#: ViewResources.cpp:306
+#: clientgui/ViewResources.cpp:279
 msgid "free, not available to BOINC: "
 msgstr "lliure, no disponible per BOINC: "
 
-#: ViewResources.cpp:316
+#: clientgui/ViewResources.cpp:289
 msgid "free: "
 msgstr "lliure: "
 
-#: ViewResources.cpp:326
+#: clientgui/ViewResources.cpp:299
 msgid "used by other programs: "
 msgstr "utilitzat per altres programes: "
 
-#: ViewStatistics.cpp:1205
+#: clientgui/ViewStatistics.cpp:1181
 msgid "User Total"
 msgstr "Total de l'Usuari"
 
-#: ViewStatistics.cpp:1206
+#: clientgui/ViewStatistics.cpp:1182
 msgid "User Average"
 msgstr "Mitjana de l'Usuari"
 
-#: ViewStatistics.cpp:1207
+#: clientgui/ViewStatistics.cpp:1183
 msgid "Host Total"
 msgstr "Total de l'Ordinador"
 
-#: ViewStatistics.cpp:1208
+#: clientgui/ViewStatistics.cpp:1184
 msgid "Host Average"
 msgstr "Mitjana de l'Ordinador"
 
-#: ViewStatistics.cpp:1355
+#: clientgui/ViewStatistics.cpp:1331
 #, c-format
 msgid "Last update: %.0f days ago"
 msgstr "Darrera actualització: fa %.0f dies"
 
-#: ViewStatistics.cpp:1982
+#: clientgui/ViewStatistics.cpp:1956
 msgid "Show user total"
 msgstr "Mostrar el total de l'usuari"
 
-#: ViewStatistics.cpp:1983
+#: clientgui/ViewStatistics.cpp:1957
 msgid "Show total credit for user"
 msgstr "Mostrar els crèdits totals de l'usuari"
 
-#: ViewStatistics.cpp:1989
+#: clientgui/ViewStatistics.cpp:1963
 msgid "Show user average"
 msgstr "Mostrar la mitjana de l'usuari"
 
-#: ViewStatistics.cpp:1990
+#: clientgui/ViewStatistics.cpp:1964
 msgid "Show average credit for user"
 msgstr "Mostrar el crèdit mitjà de l'usuari"
 
-#: ViewStatistics.cpp:1996
+#: clientgui/ViewStatistics.cpp:1970
 msgid "Show host total"
 msgstr "Mostrar el total de l'ordinador"
 
-#: ViewStatistics.cpp:1997
+#: clientgui/ViewStatistics.cpp:1971
 msgid "Show total credit for host"
 msgstr "Mostrar el crèdit total de l'ordinador"
 
-#: ViewStatistics.cpp:2003
+#: clientgui/ViewStatistics.cpp:1977
 msgid "Show host average"
 msgstr "Mostrar la mitjana de l'ordinador"
 
-#: ViewStatistics.cpp:2004
+#: clientgui/ViewStatistics.cpp:1978
 msgid "Show average credit for host"
 msgstr "Mostrar el crèdit mitjà de l'ordinador"
 
-#: ViewStatistics.cpp:2013
+#: clientgui/ViewStatistics.cpp:1987
 msgid "< &Previous project"
 msgstr "< Projecte &anterior"
 
-#: ViewStatistics.cpp:2014
+#: clientgui/ViewStatistics.cpp:1988
 msgid "Show chart for previous project"
 msgstr "Mostrar gràfica del projecte anterior"
 
-#: ViewStatistics.cpp:2019
+#: clientgui/ViewStatistics.cpp:1993
 msgid "&Next project >"
 msgstr "Projecte &següent >"
 
-#: ViewStatistics.cpp:2020
+#: clientgui/ViewStatistics.cpp:1994
 msgid "Show chart for next project"
 msgstr "Mostrar la gràfica del projecte següent"
 
-#: ViewStatistics.cpp:2026 ViewStatistics.cpp:2416
+#: clientgui/ViewStatistics.cpp:2000 clientgui/ViewStatistics.cpp:2390
 msgid "Hide project list"
 msgstr "Amaga la llista de projectes"
 
-#: ViewStatistics.cpp:2027 ViewStatistics.cpp:2416
+#: clientgui/ViewStatistics.cpp:2001 clientgui/ViewStatistics.cpp:2390
 msgid "Use entire area for graphs"
 msgstr "Utilitzeu tota l'espai per els gràfics"
 
-#: ViewStatistics.cpp:2032
+#: clientgui/ViewStatistics.cpp:2006
 msgid "Mode view"
 msgstr "Mode visual"
 
-#: ViewStatistics.cpp:2036
+#: clientgui/ViewStatistics.cpp:2010
 msgid "One project"
 msgstr "Un projecte"
 
-#: ViewStatistics.cpp:2037
+#: clientgui/ViewStatistics.cpp:2011
 msgid "Show one chart with selected project"
 msgstr "Mostrar la gràfica del projecte seleccionat"
 
-#: ViewStatistics.cpp:2043
+#: clientgui/ViewStatistics.cpp:2017
 msgid "All projects (separate)"
 msgstr "Tots els projectes (per separat)"
 
-#: ViewStatistics.cpp:2044
+#: clientgui/ViewStatistics.cpp:2018
 msgid "Show all projects, one chart per project"
 msgstr "Mostrar tots els projectes, una gràfica per projecte"
 
-#: ViewStatistics.cpp:2050
+#: clientgui/ViewStatistics.cpp:2024
 msgid "All projects (together)"
 msgstr "Tots els projectes (junts)"
 
-#: ViewStatistics.cpp:2051
+#: clientgui/ViewStatistics.cpp:2025
 msgid "Show one chart with all projects"
 msgstr "Mostrar una gràfica amb tots els projectes"
 
-#: ViewStatistics.cpp:2057
+#: clientgui/ViewStatistics.cpp:2031
 msgid "All projects (sum)"
 msgstr "Tots els projectes (suma)"
 
-#: ViewStatistics.cpp:2058
+#: clientgui/ViewStatistics.cpp:2032
 msgid "Show one chart with sum of projects"
 msgstr "Mostrar una gràfica amb tots els projectes sumats"
 
-#: ViewStatistics.cpp:2079
+#: clientgui/ViewStatistics.cpp:2053
 msgid "Statistics"
 msgstr "Estadístiques"
 
-#: ViewStatistics.cpp:2103 ViewStatistics.cpp:2124 ViewStatistics.cpp:2145
-#: ViewStatistics.cpp:2167 ViewStatistics.cpp:2188 ViewStatistics.cpp:2209
-#: ViewStatistics.cpp:2230 ViewStatistics.cpp:2251 ViewStatistics.cpp:2272
-#: ViewStatistics.cpp:2296
+#: 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 "Actualitzant les gràfiques..."
 
-#: ViewStatistics.cpp:2420
+#: clientgui/ViewStatistics.cpp:2394
 msgid "Show project list"
 msgstr "Mostrar la llista de projectes"
 
-#: ViewStatistics.cpp:2420
+#: clientgui/ViewStatistics.cpp:2394
 msgid "Uses smaller area for graphs"
 msgstr "Utilitza un àrea més petita per als gràfics"
 
-#: ViewTransfers.cpp:164
+#: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
 msgstr "Re-intentar ara"
 
-#: ViewTransfers.cpp:165
+#: clientgui/ViewTransfers.cpp:188
 msgid "Retry the file transfer now"
 msgstr "Re intentar ara la transferència d'arxius"
 
-#: ViewTransfers.cpp:171
+#: clientgui/ViewTransfers.cpp:194
 msgid "Abort Transfer"
 msgstr "Avortar el lliurament"
 
-#: ViewTransfers.cpp:172
+#: clientgui/ViewTransfers.cpp:195
 msgid "Abort this file transfer.  You won't get credit for the task."
 msgstr "Avortar la transferència d'arxius.  No rebràs cap crèdit per la tasca."
 
-#: ViewTransfers.cpp:183
+#: clientgui/ViewTransfers.cpp:210
 msgid "File"
 msgstr "Fitxer"
 
-#: ViewTransfers.cpp:184 ViewWork.cpp:233
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
 msgid "Progress"
 msgstr "Progrés"
 
-#: ViewTransfers.cpp:185
+#: clientgui/ViewTransfers.cpp:212
 msgid "Size"
 msgstr "Mida"
 
-#: ViewTransfers.cpp:186
-msgid "Elapsed Time"
-msgstr "Temps transcorregut"
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
+msgstr "Transcorregut"
 
-#: ViewTransfers.cpp:187
+#: clientgui/ViewTransfers.cpp:214
 msgid "Speed"
 msgstr "Velocitat"
 
-#: ViewTransfers.cpp:213
+#: clientgui/ViewTransfers.cpp:295
 msgid "Transfers"
 msgstr "Lliuraments"
 
-#: ViewTransfers.cpp:280
+#: clientgui/ViewTransfers.cpp:362
 msgid "Network activity is suspended - "
 msgstr "Activitat de xarxa suspesa - "
 
-#: ViewTransfers.cpp:282
+#: clientgui/ViewTransfers.cpp:364
 msgid ""
 ".\n"
 "You can enable it using the Activity menu."
 msgstr ".\nPot activar-la utilitzant el menú Activitat."
 
-#: ViewTransfers.cpp:285
+#: clientgui/ViewTransfers.cpp:367
 msgid "BOINC"
 msgstr "BOINC"
 
-#: ViewTransfers.cpp:292
+#: clientgui/ViewTransfers.cpp:374
 msgid "Retrying transfer now..."
 msgstr "Re-intentar el lliurament ara..."
 
-#: ViewTransfers.cpp:330
+#: clientgui/ViewTransfers.cpp:412
 msgid "Aborting transfer..."
 msgstr "Avortant la transferència..."
 
-#: ViewTransfers.cpp:343
+#: clientgui/ViewTransfers.cpp:425
 #, c-format
 msgid ""
 "Are you sure you want to abort this file transfer '%s'?\n"
@@ -3117,587 +3434,446 @@ msgid ""
 "will not receive credit for it."
 msgstr "Està segur que vol avortar el lliurament del fitxer '%s'?\nNOTA: Cancel·lant el lliurament invalidarà la tasca i\nno rebrà crèdit per ella."
 
-#: ViewTransfers.cpp:349
+#: clientgui/ViewTransfers.cpp:431
 msgid "Abort File Transfer"
 msgstr "Avortar el Lliurament del Fitxer"
 
-#: ViewTransfers.cpp:780
+#: clientgui/ViewTransfers.cpp:864
 msgid "Upload"
 msgstr "Pujar"
 
-#: ViewTransfers.cpp:780
+#: clientgui/ViewTransfers.cpp:864
 msgid "Download"
 msgstr "Descarregar"
 
-#: ViewTransfers.cpp:784
+#: clientgui/ViewTransfers.cpp:868
 msgid "retry in "
 msgstr "re-intentar en "
 
-#: ViewTransfers.cpp:786
+#: clientgui/ViewTransfers.cpp:870
 msgid "failed"
 msgstr "ha fallat"
 
-#: ViewTransfers.cpp:789
+#: clientgui/ViewTransfers.cpp:873
 msgid "suspended"
 msgstr "suspès"
 
-#: ViewTransfers.cpp:794
+#: clientgui/ViewTransfers.cpp:878
 msgid "active"
 msgstr "actiu"
 
-#: ViewTransfers.cpp:796
+#: clientgui/ViewTransfers.cpp:880
 msgid "pending"
 msgstr "pendent"
 
-#: ViewTransfers.cpp:803
+#: clientgui/ViewTransfers.cpp:887
 msgid " (project backoff: "
 msgstr " (backoff del projecte: "
 
-#: ViewWork.cpp:187 ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
 msgid "Show active tasks"
 msgstr "Mostrar les tasques actives"
 
-#: ViewWork.cpp:188 ViewWork.cpp:778
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
 msgid "Show only active tasks."
 msgstr "Mostrar només les tasques actives."
 
-#: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
 msgid "Show graphics"
 msgstr "Mostrar els gràfics"
 
-#: ViewWork.cpp:195 sg_TaskCommandPopup.cpp:61
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
 msgid "Show application graphics in a window."
 msgstr "Mostrar els gràfics de l'aplicació en una finestra."
 
-#: ViewWork.cpp:201
+#: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "Mostrar la consola de la VM"
 
-#: ViewWork.cpp:202
+#: clientgui/ViewWork.cpp:226
 msgid "Show VM Console in a window."
 msgstr "Mostra la consola de la VM en una finestra."
 
-#: ViewWork.cpp:209
+#: clientgui/ViewWork.cpp:233
 msgid "Suspend work for this result."
 msgstr "Suspendre la feina per aquest resultat."
 
-#: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
 msgid "Abort"
 msgstr "Avortar"
 
-#: ViewWork.cpp:216
+#: clientgui/ViewWork.cpp:240
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "Abandonar la feina per aquest resultat. No obtindrà crèdit per ella."
 
-#: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
 msgid "Show task details."
 msgstr "Mostrar els detalls de la tasca."
 
-#: ViewWork.cpp:235
-msgid "Elapsed"
-msgstr "Transcorregut"
-
-#: ViewWork.cpp:236
+#: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "Pendent (estimat)"
 
-#: ViewWork.cpp:237
+#: clientgui/ViewWork.cpp:265
 msgid "Deadline"
 msgstr "Temps límit"
 
-#: ViewWork.cpp:264
+#: clientgui/ViewWork.cpp:351
 msgid "Tasks"
 msgstr "Tasques"
 
-#: ViewWork.cpp:357
+#: clientgui/ViewWork.cpp:444
 msgid "Resuming task..."
 msgstr "Continuar la tasca..."
 
-#: ViewWork.cpp:360
+#: clientgui/ViewWork.cpp:447
 msgid "Suspending task..."
 msgstr "Suspendre la tasca..."
 
-#: ViewWork.cpp:389
+#: clientgui/ViewWork.cpp:476
 msgid "Showing graphics for task..."
 msgstr "Mostrant els gràfics de la tasca..."
 
-#: ViewWork.cpp:426
+#: clientgui/ViewWork.cpp:513
 msgid "Showing VM console for task..."
 msgstr "Mostrant consola de la VM per a la tasca..."
 
-#: ViewWork.cpp:479
+#: clientgui/ViewWork.cpp:566
 #, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %s, Status: %s)"
 msgstr "Està segur de voler avortar aquesta tasca '%s'?\n(Progrés: %s, Estat: %s)"
 
-#: ViewWork.cpp:485
+#: clientgui/ViewWork.cpp:572
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
 msgstr "Està segur que vol avortar aquestes %d tasques?"
 
-#: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
 msgid "Abort task"
 msgstr "Avortar la tasca"
 
-#: ViewWork.cpp:499
+#: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "Avortant la tasca..."
 
-#: ViewWork.cpp:771
+#: clientgui/ViewWork.cpp:858
 msgid "Show all tasks"
 msgstr "Mostrar totes les tasques"
 
-#: ViewWork.cpp:772
+#: clientgui/ViewWork.cpp:859
 msgid "Show all tasks."
 msgstr "Mostrar totes les tasques."
 
-#: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
 msgid "Resume work for this task."
 msgstr "Continuar la feina per aquesta tasca."
 
-#: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
 msgid "Suspend work for this task."
 msgstr "Aturar el treball d'aquesta tasca."
 
-#: WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Afegir un projecte o administrador de comptes"
-
-#: WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Afegir un projecte o utilitzar l'Administrador de Comptes de BOINC"
+#: clientgui/WizardAttach.cpp:571
+msgid "Do you really want to cancel?"
+msgstr "Realment vol cancel·lar?"
 
-#: 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 "Si és possible, afegeixi projectes en la\npàgina web %s.\n\nEls projectes afegits amb aquest assessor no seran\nmostrats o administrats amb %s."
+#: clientgui/WizardAttach.cpp:572
+msgid "Question"
+msgstr "Pregunta"
 
-#: 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 "Hi ha més de 30 projectes basats en BOINC\nfent recerca en moltes àrees de la ciència,\ni pot ser voluntari per a tants d'ells com vulgui.\nPot unir-se directament a un projecte,\no utilitzar un 'Administrador de comptes' per seleccionar els projectes."
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "Ctrl del Pastis"
 
-#: 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 "Has escollit afegir un nou projecte de computació voluntària o canviar els projectes\nen els que contribueixes.\n\nAlguns d'aquests projectes són administrats i manejats per World Community Grid, mentre que d'altres\nsón executats i administrats per altres investigadors o organitzacions. El programari BOINC\npot repartir la potència de processament entre qualsevol combinació de projectes.\n\nAlternativament, si s'ha registrat a un administrador de comptes de BOINC, pot utilitzar- [...]
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
+msgid "Services"
+msgstr "Serveis"
 
-#: WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Utilitzar un administrador de comptes de BOINC"
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
+#, c-format
+msgid "Hide %s"
+msgstr "Amaga %s"
 
-#: WelcomePage.cpp:352
-msgid "To continue, click Next."
-msgstr "Per continuar, prémer Següent."
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
+msgstr "Amaga Altres"
 
-#: WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Afegir o canviar els teus projectes de World Community Grid"
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
+msgstr "Mostra Tot"
 
-#: WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Afegir projectes dirigits per altres investigadors o organitzacions"
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
+msgstr "Sortir de %s"
 
-#: WizardAttach.cpp:634
-msgid "Do you really want to cancel?"
-msgstr "Realment vol cancel·lar?"
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr "Aspecte"
 
-#: WizardAttach.cpp:635
-msgid "Question"
-msgstr "Pregunta"
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr "Seleccionar l'aparença de la interfície d'usuari."
 
-#: sg_BoincSimpleFrame.cpp:149
+#: clientgui/sg_BoincSimpleFrame.cpp:181
 msgid "Advanced View...\tCtrl+Shift+A"
 msgstr "Vista Avançada...\tCTRL+SHIFT+A"
 
-#: sg_BoincSimpleFrame.cpp:150
+#: clientgui/sg_BoincSimpleFrame.cpp:182
 msgid "Display the advanced graphical interface."
 msgstr "Mostrar la interfície gràfica avançada."
 
-#: sg_BoincSimpleFrame.cpp:157
-msgid "Skin"
-msgstr "Aspecte"
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr "Configureu les opcions de visualització i la configuració de proxy"
 
-#: sg_BoincSimpleFrame.cpp:159
-msgid "Select the appearance of the user interface."
-msgstr "Seleccionar l'aparença de la interfície d'usuari."
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr "Mostrar els missatges de diagnòstic."
 
-#: sg_BoincSimpleFrame.cpp:206
+#: clientgui/sg_BoincSimpleFrame.cpp:233
 #, c-format
 msgid "&%s"
 msgstr "&%s"
 
-#: sg_BoincSimpleFrame.cpp:390
+#: clientgui/sg_BoincSimpleFrame.cpp:449
 msgid "Default"
 msgstr "Per defecte"
 
-#: sg_BoincSimpleFrame.cpp:759
+#: clientgui/sg_BoincSimpleFrame.cpp:895
 msgid "Suspend Computing"
 msgstr "Suspendre la computació"
 
-#: sg_BoincSimpleFrame.cpp:760
+#: clientgui/sg_BoincSimpleFrame.cpp:896
 msgid "Resume Computing"
 msgstr "Restaurar la computació"
 
-#: sg_BoincSimpleFrame.cpp:777
+#: clientgui/sg_BoincSimpleFrame.cpp:913
 msgid "Open a window to view notices from projects or BOINC"
 msgstr "Obrir una finestra per veure les notícies del's projectes o BOINC"
 
-#: sg_DlgMessages.cpp:146
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:360
+#, c-format
+msgid "Get help with %s"
+msgstr "Obtenir ajuda amb %s"
+
+#: clientgui/sg_DlgMessages.cpp:146
 msgid "Close"
 msgstr "Tancar"
 
-#: sg_DlgMessages.cpp:389
+#: clientgui/sg_DlgMessages.cpp:394
 #, c-format
 msgid "%s - Notices"
 msgstr "%s - Notícies"
 
-#: sg_DlgPreferences.cpp:268
-msgid "This dialog controls preferences for this computer only."
-msgstr "Aquest quadre de diàleg controla les preferències només d'aquest equip."
-
-#: sg_DlgPreferences.cpp:273
-msgid "Click OK to set preferences."
-msgstr "Prem OK per confirmar preferències."
-
-#: sg_DlgPreferences.cpp:278
-msgid ""
-"Click Clear to restore web-based settings for all preferences listed below."
-msgstr "Prem Restaura per restaurar la configuració bassada en el web que es mostren a continuació."
-
-#: sg_DlgPreferences.cpp:285
+#: clientgui/sg_DlgPreferences.cpp:206
 msgid ""
 "For additional settings, select Computing Preferences in the Advanced View."
 msgstr "Per altres paràmetres, selecciona Preferències de Computació a la Vista Avançada."
 
-#: sg_DlgPreferences.cpp:313
-msgid "Do work only between:"
-msgstr "Fer feina només entre:"
-
-#: sg_DlgPreferences.cpp:335
-msgid "Connect to internet only between:"
-msgstr "Connectar a internet només entre:"
-
-#: sg_DlgPreferences.cpp:357 sg_DlgPreferences.cpp:374
-msgid "Use no more than:"
-msgstr "No utilitzar més de:"
-
-#: sg_DlgPreferences.cpp:370
-msgid "of disk space"
-msgstr "de l'espai en disc"
-
-#: sg_DlgPreferences.cpp:387
-msgid "of the processor"
-msgstr "del processador"
-
-#: sg_DlgPreferences.cpp:391
-msgid "Do work while on battery?"
-msgstr "Fer feina mentre funcioni en bateries?"
-
-#: sg_DlgPreferences.cpp:404
-msgid "Do work after idle for:"
-msgstr "Fer feina després d'estar inactiu durant:"
+#: clientgui/sg_DlgPreferences.cpp:340
+msgid "GB of disk space"
+msgstr "GB d'espai en disc"
 
-#: sg_DlgPreferences.cpp:429
-msgid "Clear all local preferences listed above and close the dialog"
-msgstr "Netejar totes les preferències locals que es mostren i tancar la finestra"
-
-#: sg_DlgPreferences.cpp:602 sg_DlgPreferences.cpp:605
-#: sg_DlgPreferences.cpp:681 sg_DlgPreferences.cpp:685
-#: sg_DlgPreferences.cpp:697 sg_DlgPreferences.cpp:701
-#: sg_DlgPreferences.cpp:844 sg_DlgPreferences.cpp:855
-msgid "Anytime"
-msgstr "En qualsevol moment"
-
-#: sg_DlgPreferences.cpp:638
-msgid "100 MB"
-msgstr "100 MB"
-
-#: sg_DlgPreferences.cpp:639
-msgid "200 MB"
-msgstr "200 MB"
-
-#: sg_DlgPreferences.cpp:640
-msgid "500 MB"
-msgstr "500 MB"
-
-#: sg_DlgPreferences.cpp:641
-msgid "1 GB"
-msgstr "1 GB"
-
-#: sg_DlgPreferences.cpp:642
-msgid "2 GB"
-msgstr "2 GB"
-
-#: sg_DlgPreferences.cpp:643
-msgid "5 GB"
-msgstr "5 GB"
-
-#: sg_DlgPreferences.cpp:644
-msgid "10 GB"
-msgstr "10 GB"
-
-#: sg_DlgPreferences.cpp:645
-msgid "20 GB"
-msgstr "20 GB"
-
-#: sg_DlgPreferences.cpp:646
-msgid "50 GB"
-msgstr "50 GB"
-
-#: sg_DlgPreferences.cpp:647
-msgid "100 GB"
-msgstr "100 GB"
-
-#: sg_DlgPreferences.cpp:717
+#: clientgui/sg_DlgPreferences.cpp:1089
 #, c-format
-msgid "%d MB"
-msgstr "%d MB"
+msgid "%s - Computing Preferences"
+msgstr "%s - Preferències de Computació"
 
-#: sg_DlgPreferences.cpp:719
-#, c-format
-msgid "%4.2f GB"
-msgstr "%4.2f GB"
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "Descartar totes les preferències locals i utilitzar les basades en el web?"
 
-#: sg_DlgPreferences.cpp:760
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: sg_DlgPreferences.cpp:796
-msgid "0 (Run Always)"
-msgstr "0 (Executar Sempre)"
-
-#: sg_DlgPreferences.cpp:799
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: sg_DlgPreferences.cpp:1029
-msgid "Do you really want to clear all local preferences?\n"
-msgstr "Està segur d'eliminar totes les preferències locals?\n"
-
-#: sg_ProjectPanel.cpp:72
+#: clientgui/sg_ProjectPanel.cpp:72
 msgid "Add Project"
 msgstr "Afegeix un projecte"
 
-#: sg_ProjectPanel.cpp:73
+#: clientgui/sg_ProjectPanel.cpp:73
 msgid "Synchronize"
 msgstr "Sincronitzar"
 
-#: sg_ProjectPanel.cpp:74
+#: clientgui/sg_ProjectPanel.cpp:74
 msgid "Work done for this project"
 msgstr "Treball realitzat per aquest projecte"
 
-#: sg_ProjectPanel.cpp:77
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "Voluntariat per a tots o algun dels més de 30 projectes en moltes àrees de la ciència"
+
+#: clientgui/sg_ProjectPanel.cpp:77
 msgid "Synchronize projects with account manager system"
 msgstr "Sincronitzar els projectes amb el sistema de l'administrador de comptes"
 
-#: sg_ProjectPanel.cpp:124
+#. 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 "Seleccioneu un projecte per a l'accés amb els controls de baix"
 
-#: sg_ProjectPanel.cpp:145
+#: clientgui/sg_ProjectPanel.cpp:145
 msgid "Project Web Pages"
 msgstr "Pàgines Web del Projecte"
 
-#: sg_ProjectPanel.cpp:149
+#: clientgui/sg_ProjectPanel.cpp:149
 msgid "Project Commands"
 msgstr "Comandaments del Projecte"
 
-#: sg_ProjectPanel.cpp:267
+#: clientgui/sg_ProjectPanel.cpp:276
 #, c-format
 msgid "Pop up a menu of web sites for project %s"
 msgstr "Obre un menú dels llocs web del projecte %s"
 
-#: sg_ProjectPanel.cpp:269
+#: clientgui/sg_ProjectPanel.cpp:278
 #, c-format
 msgid "Pop up a menu of commands to apply to project %s"
 msgstr "Obre un menú d'ordres per aplicar al projecte %s"
 
-#: sg_TaskCommandPopup.cpp:67
+#: clientgui/sg_TaskCommandPopup.cpp:73
 msgid "Suspend this task."
 msgstr "Suspendre aquesta tasca."
 
-#: sg_TaskCommandPopup.cpp:73
+#: clientgui/sg_TaskCommandPopup.cpp:79
 msgid "Abandon this task. You will get no credit for it."
 msgstr "Abandona aquesta tasca. No rebràs cap crèdit per ella."
 
-#: sg_TaskCommandPopup.cpp:251
+#: clientgui/sg_TaskCommandPopup.cpp:267
 #, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %.1lf%%, Status: %s)"
 msgstr "Està segur de voler avortar aquesta tasca '%s'?\n(Progrés: %.1lf%%, Estat: %s)"
 
-#: sg_TaskPanel.cpp:464
+#: clientgui/sg_TaskPanel.cpp:468
 msgid "You don't have any projects.  Please Add a Project."
 msgstr "No te cap projecte. Si us plau, afegeixi un  projecte."
 
-#: sg_TaskPanel.cpp:465
+#: clientgui/sg_TaskPanel.cpp:469
 msgid "Not available"
 msgstr "No disponible"
 
-#: sg_TaskPanel.cpp:476
+#: clientgui/sg_TaskPanel.cpp:480
 msgid "Tasks:"
 msgstr "Tasques:"
 
-#: sg_TaskPanel.cpp:482
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
 msgid "Select a task to access"
 msgstr "Seleccioneu una tasca per accedir-hi"
 
-#: sg_TaskPanel.cpp:493
+#: clientgui/sg_TaskPanel.cpp:497
 msgid "From:"
 msgstr "De:"
 
-#: sg_TaskPanel.cpp:547
+#: clientgui/sg_TaskPanel.cpp:551
 msgid "This task's progress"
 msgstr "Progrés d'aquesta tasca"
 
-#: sg_TaskPanel.cpp:565
+#: clientgui/sg_TaskPanel.cpp:569
 msgid "Task Commands"
 msgstr "Ordres de la tasca"
 
-#: sg_TaskPanel.cpp:566
+#: clientgui/sg_TaskPanel.cpp:570
 msgid "Pop up a menu of commands to apply to this task"
 msgstr "Obre un menú d'ordres per aplicar a aquesta tasca"
 
-#: sg_TaskPanel.cpp:701
+#: clientgui/sg_TaskPanel.cpp:705
 #, c-format
 msgid "Application: %s"
 msgstr "Aplicació: %s"
 
-#: sg_TaskPanel.cpp:724
+#: clientgui/sg_TaskPanel.cpp:728
 #, c-format
 msgid "%.3f%%"
 msgstr "%.3f%%"
 
-#: sg_TaskPanel.cpp:732
+#: clientgui/sg_TaskPanel.cpp:736
 msgid "Application: Not available"
 msgstr "Aplicació: No disponible"
 
-#: sg_TaskPanel.cpp:832
+#: clientgui/sg_TaskPanel.cpp:836
 msgid "Not Available"
 msgstr "No Disponible"
 
-#: sg_TaskPanel.cpp:847
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
 msgid "Elapsed: %s"
 msgstr "Transcorregut: %s"
 
-#: sg_TaskPanel.cpp:861
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
 msgid "Remaining (estimated): %s"
 msgstr "Pendent (estimat): %s"
 
-#: sg_TaskPanel.cpp:876
+#: clientgui/sg_TaskPanel.cpp:880
 #, c-format
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: sg_TaskPanel.cpp:1223
+#: clientgui/sg_TaskPanel.cpp:1228
 msgid "Retrieving current status."
 msgstr "Recuperant estat actual."
 
-#: sg_TaskPanel.cpp:1229
+#: clientgui/sg_TaskPanel.cpp:1234
 msgid "Downloading work from the server."
 msgstr "Descarregant feina des del servidor."
 
-#: sg_TaskPanel.cpp:1234
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "Procés en suspens:  Execució En Bateries."
 
-#: sg_TaskPanel.cpp:1236
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Processing Suspended:  User Active."
 msgstr "Procés en suspens:  Usuari Actiu."
 
-#: sg_TaskPanel.cpp:1238
+#: clientgui/sg_TaskPanel.cpp:1243
 msgid "Processing Suspended:  User paused processing."
 msgstr "Procés en suspens:  L'usuari ha aturat l'execució."
 
-#: sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1245
 msgid "Processing Suspended:  Time of Day."
 msgstr "Procés en suspens:  Canviar Hora."
 
-#: sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1247
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "Procés en suspens:  Executant Test de Rendiment."
 
-#: sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1249
 msgid "Processing Suspended."
 msgstr "Procés en suspens."
 
-#: sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1253
 msgid "Waiting to contact project servers."
 msgstr "Esperant contactar amb els servidors del projecte."
 
-#: sg_TaskPanel.cpp:1252 sg_TaskPanel.cpp:1261
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
 msgid "Retrieving current status"
 msgstr "Recuperant l'estat actual"
 
-#: sg_TaskPanel.cpp:1256
+#: clientgui/sg_TaskPanel.cpp:1261
 msgid "No work available to process"
 msgstr "No hi ha feina disponible a processar"
 
-#: sg_TaskPanel.cpp:1258
+#: clientgui/sg_TaskPanel.cpp:1263
 msgid "Unable to connect to the core client"
 msgstr "Impossible connectar amb el client"
 
-#: wizardex.cpp:377 wizardex.cpp:553
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
 msgstr "&Següent >"
 
-#: wizardex.cpp:383
+#: clientgui/wizardex.cpp:383
 msgid "< &Back"
 msgstr "< &Enrere"
 
-#: wizardex.cpp:553
+#: clientgui/wizardex.cpp:553
 msgid "&Finish"
 msgstr "&Finalitzar"
 
-#: mac/Mac_GUI.cpp:110
-msgid "Preferences…"
-msgstr "Preferències…"
-
-#: mac/Mac_GUI.cpp:122
-msgid "Services"
-msgstr "Serveis"
+#. /////////////////////////////////////////////////////////////////////////
+#: clientgui/DlgAdvPreferencesBase.h:45
+msgid "On this day of the week, compute only during these hours."
+msgstr "En aquest dia de la setmana, calcula només durant aquestes hores."
 
-#: mac/Mac_GUI.cpp:144
-#, c-format
-msgid "Hide %s"
-msgstr "Amaga %s"
-
-#: mac/Mac_GUI.cpp:158
-msgid "Hide Others"
-msgstr "Amaga Altres"
-
-#: mac/Mac_GUI.cpp:172
-msgid "Show All"
-msgstr "Mostra Tot"
-
-#: mac/Mac_GUI.cpp:186
-#, c-format
-msgid "Quit %s"
-msgstr "Sortir de %s"
+#: clientgui/DlgAdvPreferencesBase.h:46
+msgid "On this day of the week, transfer files only during these hours."
+msgstr "En aquest dia de la setmana, envia els fitxers només durant les següents hores."
diff --git a/locale/ca/BOINC-Project-Generic.po b/locale/ca/BOINC-Project-Generic.po
index cbc50fa..c209521 100644
--- a/locale/ca/BOINC-Project-Generic.po
+++ b/locale/ca/BOINC-Project-Generic.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-03-04 08:56 PST\n"
-"PO-Revision-Date: 2015-03-24 17:51+0000\n"
+"PO-Revision-Date: 2015-05-07 12:42+0000\n"
 "Last-Translator: Xavier Mor-Mur <xavi.mormur at gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/boinc/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/ca/BOINC-Web.mo b/locale/ca/BOINC-Web.mo
index 6079076..d562cda 100644
Binary files a/locale/ca/BOINC-Web.mo and b/locale/ca/BOINC-Web.mo differ
diff --git a/locale/ca/BOINC-Web.po b/locale/ca/BOINC-Web.po
index b9e1d3a..dd083c5 100644
--- a/locale/ca/BOINC-Web.po
+++ b/locale/ca/BOINC-Web.po
@@ -8,11 +8,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2015-02-08 18:28+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"PO-Revision-Date: 2015-04-22 12:56+0000\n"
+"Last-Translator: Rom Walton\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/boinc/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/cs/BOINC-Project-Generic.po b/locale/cs/BOINC-Project-Generic.po
index 3492cb9..7d91184 100644
--- a/locale/cs/BOINC-Project-Generic.po
+++ b/locale/cs/BOINC-Project-Generic.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-03-04 08:56 PST\n"
-"PO-Revision-Date: 2015-03-13 13:41+0000\n"
+"PO-Revision-Date: 2015-05-07 12:42+0000\n"
 "Last-Translator: Petr Nekvinda <petr.nekvinda at gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/boinc/language/cs/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/cs/BOINC-Setup.mo b/locale/cs/BOINC-Setup.mo
index 689ceb7..5aa494e 100644
Binary files a/locale/cs/BOINC-Setup.mo and b/locale/cs/BOINC-Setup.mo differ
diff --git a/locale/cs/BOINC-Setup.po b/locale/cs/BOINC-Setup.po
index 119d905..d25436c 100644
--- a/locale/cs/BOINC-Setup.po
+++ b/locale/cs/BOINC-Setup.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-28 17:26+0000\n"
+"PO-Revision-Date: 2015-04-20 12:34+0000\n"
 "Last-Translator: Petr Nekvinda <petr.nekvinda at gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/boinc/language/cs/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/de/BOINC-Project-Generic.po b/locale/de/BOINC-Project-Generic.po
index 7be83c6..e5cfa8e 100644
--- a/locale/de/BOINC-Project-Generic.po
+++ b/locale/de/BOINC-Project-Generic.po
@@ -6,12 +6,14 @@
 # FileID  : $Id$
 # 
 # Translators:
+# Christian Beer <christian.beer at posteo.de>, 2015
+# Wolf Dieter Dallinger <wolf.dieter at dallinger.de>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
-"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2015-02-13 16:13+0000\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-05-16 14:55+0000\n"
 "Last-Translator: Christian Beer <christian.beer at posteo.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/boinc/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -27,6 +29,96 @@ msgstr "Deutsch"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "German"
 
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "Einladungs-Code"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "Zum Erstellen eines Kontos ist ein gültiger Einladungscode erforderlich."
+
+#: ../inc/account.inc:44 ../inc/host.inc:674 ../inc/result.inc:632
+#: ../inc/team.inc:219 ../inc/team.inc:367 ../inc/user.inc:198
+#: ../user/account_finish.php:41 ../user/team_admins.php:64
+#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:73
+#: ../user/top_users.php:49 ../user/user_search.php:124
+msgid "Name"
+msgstr "Name"
+
+#: ../inc/account.inc:44 ../user/account_finish.php:41
+msgid "Identifies you on our web site. Use your real name or a nickname."
+msgstr "Identifiziert Sie auf unserer Webseite. Verwenden Sie Ihren richtigen Namen oder einen Nicknamen."
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "E-Mail-Adresse"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "Muss eine gültige E-Mail-Adresse in der Form 'name at domain.tld' sein."
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "Passwort"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "Muss aus mindestens %1 Zeichen bestehen."
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "Passwort bestätigen"
+
+#: ../inc/account.inc:63 ../inc/team.inc:43 ../inc/team.inc:129
+#: ../inc/team.inc:242 ../inc/team.inc:382 ../inc/team.inc:470
+#: ../inc/user.inc:212 ../inc/user.inc:395 ../user/account_finish.php:45
+#: ../user/edit_user_info_form.php:38 ../user/profile_search_action.php:44
+#: ../user/team_email_list.php:73 ../user/team_search.php:85
+#: ../user/top_users.php:63 ../user/user_search.php:53
+#: ../user/user_search.php:125
+msgid "Country"
+msgstr "Land"
+
+#: ../inc/account.inc:63 ../user/account_finish.php:45
+msgid "Select the country you want to represent, if any."
+msgstr "Wählen Sie, falls gewünscht, das Land, das Sie vertreten möchten."
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "Postleitzahl"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "Freiwillig"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "Konto erstellen"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "E-Mail-Adresse:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "E-Mail-Adresse vergessen?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "Passwort:"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "Passwort vergessen?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "angemeldet bleiben"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "Anmelden"
+
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
 msgstr "Fettgeschriebener Text: [b]text[/b] (alt+b)"
@@ -40,323 +132,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr "Unterstrichener Text: [u]text[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "Durchgestrichener Text: [s]text[/s]  (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "Zitate: [quote]text[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "Quelltext anzeigen: [code]Quelltext[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "Listen: [list]text[/list] (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "Nummerierte Listen: [list=]text[/list]  (alt+o)"
 
-#: ../inc/bbcode_html.inc:32
+#: ../inc/bbcode_html.inc:35
 msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
 msgstr "Ein Bild einfügen: [img]http://bild_url[/img]  (alt+p)"
 
-#: ../inc/bbcode_html.inc:35
+#: ../inc/bbcode_html.inc:38
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
 msgstr "Einen Link einfügen: [url]http://linkadresse[/url] oder [url=http://linkadresse]linktext[/url]  (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "Schriftfarbe"
 
-#: ../inc/bbcode_html.inc:43
+#: ../inc/bbcode_html.inc:46
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
 msgstr "Schriftfarbe: [color=red]text[/color]  Tipp: es funktioniert auch so: color=#FF0000"
 
-#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
+#: ../inc/bbcode_html.inc:47 ../inc/bbcode_html.inc:62
+#: ../inc/prefs_util.inc:546
 msgid "Default"
 msgstr "Standard"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "Dunkelrot"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "Rot"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "Orange"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "Braun"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "Gelb"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
 msgstr "Grün"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
 msgstr "Olivgrün"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
 msgstr "Türkis"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
 msgstr "Blau"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "Dunkelblau"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
 msgstr "Violett"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
 msgstr "Schriftgröße: [size=x-small]kleiner Text[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
 msgstr "Klein"
 
-#: ../inc/bbcode_html.inc:61
+#: ../inc/bbcode_html.inc:64
 msgid "Normal"
 msgstr "Normal"
 
-#: ../inc/bbcode_html.inc:62
+#: ../inc/bbcode_html.inc:65
 msgid "Large"
 msgstr "Groß"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close all open bbCode tags"
 msgstr "Alle offenen bbCodes schließen"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
 msgstr "Tags schließen"
 
-#: ../inc/forum.inc:37
+#: ../inc/forum.inc:38
 msgid "Oldest first"
 msgstr "Älteste zuerst"
 
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
 msgid "Newest first"
 msgstr "Neueste zuerst"
 
-#: ../inc/forum.inc:39
+#: ../inc/forum.inc:40
 msgid "Highest rated posts first"
 msgstr "Am besten bewertete Beiträge zuerst"
 
-#: ../inc/forum.inc:41
+#: ../inc/forum.inc:42
 msgid "Newest post first"
 msgstr "Neuster Beitrag zuerst"
 
-#: ../inc/forum.inc:42
+#: ../inc/forum.inc:43
 msgid "Most views first"
 msgstr "Meist angesehene zuerst"
 
-#: ../inc/forum.inc:43
+#: ../inc/forum.inc:44
 msgid "Most posts first"
 msgstr "Meiste Beiträge zuerst"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search for words in forum messages"
 msgstr "Suche in Forenbeiträgen"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search forums"
 msgstr "Suche im Forum"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:127
 msgid "Advanced search"
 msgstr "Erweiterte Suche"
 
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
-#: ../user/pm.php:133
+#: ../inc/forum.inc:133 ../inc/user.inc:325 ../user/pm.php:69
+#: ../user/pm.php:138
 msgid "Private messages"
 msgstr "Private Nachrichten"
 
-#: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
-#: ../user/forum_forum.php:71 ../user/sample_index.php:130
+#: ../inc/forum.inc:152 ../user/forum_forum.php:74
+#: ../user/sample_index.php:128
 msgid "Questions and Answers"
 msgstr "Fragen und Antworten"
 
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250
-#: ../inc/user.inc:375 ../user/bs_sample_index.php:62
-#: ../user/forum_forum.php:73 ../user/sample_index.php:129
-#: ../project.sample/project.inc:43
+#: ../inc/forum.inc:152 ../inc/forum.inc:184 ../inc/user.inc:321
+#: ../inc/user.inc:454 ../user/forum_forum.php:76 ../user/sample_index.php:127
+#: ../project.sample/project.inc:70
 msgid "Message boards"
 msgstr "Diskussionsforen"
 
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
 msgid "%1 message board"
 msgstr "%1 Diskussionsforen"
 
-#: ../inc/forum.inc:245 ../inc/result.inc:695
+#: ../inc/forum.inc:246 ../inc/result.inc:717
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../inc/forum.inc:283 ../inc/result.inc:704
+#: ../inc/forum.inc:284 ../inc/result.inc:726
 msgid "Next"
 msgstr "Nächste"
 
-#: ../inc/forum.inc:412 ../inc/forum.inc:1175 ../user/forum_forum.php:137
-#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
+#: ../inc/forum.inc:413 ../inc/forum.inc:1218 ../user/forum_forum.php:140
+#: ../user/forum_reply.php:126 ../user/forum_report_post.php:79
 msgid "Author"
 msgstr "Autor"
 
-#: ../inc/forum.inc:412 ../inc/pm.inc:86 ../user/forum_edit.php:128
-#: ../user/forum_edit.php:133 ../user/forum_post.php:116
-#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
-#: ../user/pm.php:90 ../user/pm.php:144
+#: ../inc/forum.inc:413 ../inc/pm.inc:86 ../user/forum_edit.php:128
+#: ../user/forum_edit.php:133 ../user/forum_post.php:120
+#: ../user/forum_reply.php:126 ../user/forum_report_post.php:79
+#: ../user/pm.php:90 ../user/pm.php:149
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send message"
 msgstr "Nachricht senden"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
 msgstr "Private Nachricht an %1 senden"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
 msgstr "Beigetreten: %1"
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr "Beiträge: %1"
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
 msgstr "Punkte: %1"
 
-#: ../inc/forum.inc:597
+#: ../inc/forum.inc:600
 msgid "RAC: %1"
 msgstr "Punktedurchschnitt pro Tag: %1"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "You haven't read this message yet"
 msgstr "Sie haben diese Nachricht noch nicht gelesen"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "ungelesen"
 
-#: ../inc/forum.inc:623 ../inc/forum.inc:628 ../inc/forum.inc:727
+#: ../inc/forum.inc:627 ../inc/forum.inc:632 ../inc/forum.inc:731
 msgid "Message %1"
 msgstr "Nachricht %1"
 
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:628 ../inc/user.inc:409 ../user/forum_forum.php:178
 msgid "hidden"
 msgstr "verborgen"
 
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
 msgstr "Geschrieben: %1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:632
 msgid " - in response to "
 msgstr " - als Antwort für "
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:635
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../inc/forum.inc:631
+#: ../inc/forum.inc:635
 msgid "Edit this message"
 msgstr "Diese Nachricht bearbeiten"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
 msgstr "Zuletzt geändert: %1"
 
-#: ../inc/forum.inc:640
+#: ../inc/forum.inc:644
 msgid ""
 "This post is not shown because the sender is on your 'ignore' list.  Click "
 "%1here%2 to view this post"
 msgstr "Dieser Beitrag wird nicht angezeigt weil der Absender von Ihnen geblockt wurde. %1Trotzdem anzeigen%2."
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
 msgstr "Diesen Beitrag als anstößig melden"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
 msgstr "Als anstößig melden"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
 msgstr "Bewertung: %1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
 msgstr "Bewerten: "
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
 msgstr "Hier klicken wenn Sie diesen Beitrag hilfreich finden."
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
 msgstr "positiv bewerten"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
 msgstr "Hier klicken wenn Ihnen dieser Beitrag nicht gefällt."
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
 msgstr "negativ bewerten"
 
-#: ../inc/forum.inc:685 ../user/pm.php:106 ../user/pm.php:146
+#: ../inc/forum.inc:689 ../user/pm.php:111 ../user/pm.php:151
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:689
 msgid "Post a reply to this message"
 msgstr "Auf diesen Beitrag antworten."
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Quote"
 msgstr "Zitieren"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
 msgstr "Beim antworten diesen Beitrag zitieren"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
 msgstr "Von einem Moderator versteckt"
 
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
 msgstr "Geschrieben am %1 von %2"
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
 msgstr "Sie können keine Beiträge schreiben oder bewerten bis %1."
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -374,340 +470,350 @@ msgid ""
 "        "
 msgstr "\n        <ul>\n        <li> Beiträge müssen 'kinderfreundlich' sein: Sie dürfen keine\n            obszönen, hasserfüllten, sexuell freizügige\n            oder andeutende Inhalte haben.\n        <li> Keine kommerzielle Werbung.\n        <li> Keine Verlinkung auf Webseiten mit sexuellen Inhalten,\n            Glücksspiel, oder Intoleranz gegenüber anderen.\n        <li> Keine Beiträge die andere verärgern oder reizen sollen,\n            oder das Thema an sich reißen sollen.\n   [...]
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
 msgstr "Regeln:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:785
 msgid "More info"
 msgstr "mehr Informationen"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
 msgid "Unhide"
 msgstr "Sichtbar machen"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
 msgstr "Beitrag sichtbar machen"
 
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
+#: ../inc/forum.inc:1084 ../user/forum_thread.php:196
 msgid "Hide"
 msgstr "Verstecken"
 
-#: ../inc/forum.inc:1057
+#: ../inc/forum.inc:1084
 msgid "Hide this post"
 msgstr "Beitrag verstecken"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
 msgid "Move"
 msgstr "Verschieben"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
 msgstr "Diesen Beitrag in ein anderes Thema verschieben"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1094
 msgid "Banish author"
 msgstr "Autor verbannen"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
 msgstr "Für die Verbannung des Autors abstimmen"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
 msgstr "Gegen die Verbannung des Autors abstimmen"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
 msgstr "Eine Abstimmung zur Verbannung des Autors starten"
 
-#: ../inc/forum.inc:1116
+#: ../inc/forum.inc:1115 ../inc/user.inc:312 ../user/forum_thread.php:243
+#: ../user/pm.php:112 ../user/pm.php:152
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "Diesen Beitrag löschen"
+
+#: ../inc/forum.inc:1153
 msgid "Only team members can post to the team message board"
 msgstr "Nur Teammitglieder können Beiträge im Teamforum erstellen."
 
-#: ../inc/forum.inc:1126
+#: ../inc/forum.inc:1163
 msgid ""
 "In order to create a new thread in %1 you must have a certain amount of "
 "credit. This is to prevent and protect against abuse of the system."
 msgstr "Um ein neues Thema in %1 anlegen zu können, müssen Sie über eine bestimmte Punkteanzahl verfügen. Dies soll vor Missbrauch des Systems schützen."
 
-#: ../inc/forum.inc:1133
+#: ../inc/forum.inc:1170
 msgid ""
 "You cannot create any more threads right now. Please wait a while before "
 "trying again. This delay has been enforced to protect against abuse of the "
 "system."
 msgstr "Sie können für den Moment keine weiteren Themen mehr anlegen. Bitte warten Sie einige Zeit und versuchen Sie es dann erneut. Diese Verzögerung wurde eingeführt, um Missbrauch des Systems vorzubeugen."
 
-#: ../inc/forum.inc:1140
+#: ../inc/forum.inc:1177
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
 msgstr "Dieses Thema ist geschlossen. Nur Moderatoren oder Administratoren dürfen hier Beiträge erstellen."
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
 msgstr "In einem versteckten Thema kann kein Beitrag erstellt werden."
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "Themen"
 
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
-#: ../user/forum_index.php:94
+#: ../inc/forum.inc:1217 ../inc/team.inc:135 ../user/forum_forum.php:139
+#: ../user/forum_index.php:99
 msgid "Posts"
 msgstr "Beiträge"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1219 ../user/forum_forum.php:141
 msgid "Views"
 msgstr "Ansichten"
 
-#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
-#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
+#: ../inc/forum.inc:1220 ../inc/team.inc:135 ../user/forum_forum.php:142
+#: ../user/forum_help_desk.php:48 ../user/forum_index.php:100
 msgid "Last post"
 msgstr "Letzter Beitrag"
 
-#: ../inc/forum.inc:1235
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
 msgstr "Neue Beiträge im Thema %1"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
 msgstr "Neue Beiträge in abonniertem Thema"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
 msgstr "Es gibt neue Beiträge im Thema '%1'"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "Alle Themen als gelesen markieren"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
 msgstr "Alle Themen in allen Bereichen als gelesen markieren."
 
-#: ../inc/host.inc:24
+#: ../inc/host.inc:25
 msgid "No host"
 msgstr "Kein Computer angegeben"
 
-#: ../inc/host.inc:26
+#: ../inc/host.inc:27
 msgid "Unavailable"
 msgstr "Nicht verfügbar"
 
-#: ../inc/host.inc:56 ../inc/prefs.inc:639 ../inc/prefs.inc:1048
+#: ../inc/host.inc:56 ../inc/prefs.inc:665 ../inc/prefs_util.inc:547
 msgid "Home"
 msgstr "zu Hause"
 
-#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
+#: ../inc/host.inc:57 ../inc/prefs.inc:666 ../inc/prefs_util.inc:549
+#: ../user/server_status.php:138
 msgid "Work"
 msgstr "Arbeit"
 
-#: ../inc/host.inc:58 ../inc/prefs.inc:640 ../inc/prefs.inc:1050
+#: ../inc/host.inc:58 ../inc/prefs.inc:667 ../inc/prefs_util.inc:548
 msgid "School"
 msgstr "in der Schule"
 
-#: ../inc/host.inc:59
-msgid "Mobile"
-msgstr "Mobil"
-
-#: ../inc/host.inc:61 ../user/edit_forum_preferences_form.php:172
-#: ../user/edit_forum_preferences_form.php:173
+#: ../inc/host.inc:60 ../user/edit_forum_preferences_form.php:161
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../inc/host.inc:85
+#: ../inc/host.inc:84
 msgid "Computer information"
 msgstr "Informationen zum Computer"
 
-#: ../inc/host.inc:89 ../inc/host.inc:94
+#: ../inc/host.inc:88 ../inc/host.inc:93
 msgid "IP address"
 msgstr "IP Adresse"
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr "(die letzten %1 mal gleich)"
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr "Externe IP-Adresse"
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr "Zeige IP-Adresse"
 
-#: ../inc/host.inc:96
+#: ../inc/host.inc:95
 msgid "Domain name"
 msgstr "Domäne"
 
-#: ../inc/host.inc:98
+#: ../inc/host.inc:97
 msgid "Product name"
 msgstr "Produktname"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "Local Standard Time"
 msgstr "Ortszeit"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "UTC %1 hours"
 msgstr "GMT %1 Stunden"
 
-#: ../inc/host.inc:106 ../inc/host.inc:108 ../inc/host.inc:222
+#: ../inc/host.inc:105 ../inc/host.inc:107 ../inc/host.inc:222
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../inc/host.inc:108 ../inc/host.inc:355
+#: ../inc/host.inc:107 ../inc/host.inc:360
 msgid "Anonymous"
 msgstr "anonym"
 
-#: ../inc/host.inc:112 ../inc/result.inc:630
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
 msgid "Created"
 msgstr "Erstellt"
 
-#: ../inc/host.inc:113 ../inc/host.inc:226 ../inc/host.inc:231
-#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:215
-#: ../inc/team.inc:220 ../inc/team.inc:222 ../inc/team.inc:364
-#: ../inc/team.inc:369 ../inc/user.inc:125 ../inc/user.inc:138
-#: ../user/profile_search_action.php:43
-#: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64
-#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
-#: ../user/top_users.php:59 ../user/user_search.php:140
+#: ../inc/host.inc:112 ../inc/host.inc:226 ../inc/host.inc:231
+#: ../inc/host.inc:686 ../inc/team.inc:105 ../inc/team.inc:224
+#: ../inc/team.inc:229 ../inc/team.inc:231 ../inc/team.inc:373
+#: ../inc/team.inc:378 ../inc/user.inc:126 ../inc/user.inc:139
+#: ../user/profile_search_action.php:45
+#: ../user/team_change_founder_form.php:80 ../user/team_email_list.php:73
+#: ../user/team_remove_inactive_form.php:43 ../user/top_users.php:54
+#: ../user/top_users.php:59 ../user/user_search.php:125
 msgid "Total credit"
 msgstr "Gesamtguthaben"
 
-#: ../inc/host.inc:114 ../inc/user.inc:125 ../user/team_search.php:70
-#: ../user/user_search.php:139
+#: ../inc/host.inc:113 ../inc/user.inc:126 ../user/team_search.php:83
+#: ../user/user_search.php:124
 msgid "Average credit"
 msgstr "Durchschnittliche Punkte"
 
-#: ../inc/host.inc:116
+#: ../inc/host.inc:115
 msgid "Cross project credit"
 msgstr "Projektübergreifende Punkte"
 
-#: ../inc/host.inc:118
+#: ../inc/host.inc:117
 msgid "CPU type"
 msgstr "CPU Typ"
 
-#: ../inc/host.inc:119
+#: ../inc/host.inc:118
 msgid "Number of processors"
 msgstr "Anzahl der Prozessoren"
 
-#: ../inc/host.inc:121
+#: ../inc/host.inc:120
 msgid "Coprocessors"
 msgstr "Koprozessor"
 
-#: ../inc/host.inc:123 ../inc/host.inc:687
+#: ../inc/host.inc:122 ../inc/host.inc:692
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: ../inc/host.inc:126 ../inc/host.inc:235
+#: ../inc/host.inc:125 ../inc/host.inc:235
 msgid "BOINC version"
 msgstr "BOINC Version"
 
-#: ../inc/host.inc:130
+#: ../inc/host.inc:129 ../inc/prefs.inc:237
 msgid "Memory"
 msgstr "Arbeitsspeicher"
 
-#: ../inc/host.inc:130 ../inc/host.inc:140
+#: ../inc/host.inc:129 ../inc/host.inc:139
 msgid "%1 MB"
 msgstr "%1 MB"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "Cache"
 msgstr "CPU Cache"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "%1 KB"
 msgstr "%1 KB"
 
-#: ../inc/host.inc:140
+#: ../inc/host.inc:139
 msgid "Swap space"
 msgstr "Auslagerungsdatei"
 
-#: ../inc/host.inc:143
+#: ../inc/host.inc:142
 msgid "Total disk space"
 msgstr "gesamter Festplattenspeicher"
 
-#: ../inc/host.inc:143 ../inc/host.inc:146
+#: ../inc/host.inc:142 ../inc/host.inc:145
 msgid "%1 GB"
 msgstr "%1 GB"
 
-#: ../inc/host.inc:146
+#: ../inc/host.inc:145
 msgid "Free Disk Space"
 msgstr "freier Festplattenspeicher"
 
-#: ../inc/host.inc:150
+#: ../inc/host.inc:149
 msgid "Measured floating point speed"
 msgstr "ermittelte Geschwindigkeit für Gleitkommazahlen"
 
-#: ../inc/host.inc:150 ../inc/host.inc:153
+#: ../inc/host.inc:149 ../inc/host.inc:152
 msgid "%1 million ops/sec"
 msgstr "%1 Millionen Operationen/Sek"
 
-#: ../inc/host.inc:153
+#: ../inc/host.inc:152
 msgid "Measured integer speed"
 msgstr "ermittelte Geschwindigkeit für ganze Zahlen"
 
-#: ../inc/host.inc:157 ../inc/host.inc:159
+#: ../inc/host.inc:156 ../inc/host.inc:158
 msgid "Average upload rate"
 msgstr "mittlere Uploadgeschwindigkeit"
 
-#: ../inc/host.inc:157 ../inc/host.inc:164
+#: ../inc/host.inc:156 ../inc/host.inc:163
 msgid "%1 KB/sec"
 msgstr "%1 KB/sek"
 
-#: ../inc/host.inc:159 ../inc/host.inc:166 ../inc/result.inc:216
+#: ../inc/host.inc:158 ../inc/host.inc:165 ../inc/result.inc:216
 #: ../inc/result.inc:226 ../inc/result.inc:244 ../inc/result.inc:262
 #: ../inc/result.inc:278 ../user/explain_state.php:56
 #: ../user/host_app_versions.php:30
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../inc/host.inc:164 ../inc/host.inc:166
+#: ../inc/host.inc:163 ../inc/host.inc:165
 msgid "Average download rate"
 msgstr "mittlere Downloadgeschwindigkeit"
 
-#: ../inc/host.inc:169 ../user/host_app_versions.php:65
+#: ../inc/host.inc:168 ../user/host_app_versions.php:65
 msgid "Average turnaround time"
 msgstr "mittlere Taskdauer"
 
-#: ../inc/host.inc:169 ../user/forum_search.php:46 ../user/forum_search.php:47
-#: ../user/forum_search.php:48 ../user/forum_search.php:49
+#: ../inc/host.inc:168 ../user/forum_search.php:48 ../user/forum_search.php:49
+#: ../user/forum_search.php:50 ../user/forum_search.php:51
 msgid "%1 days"
 msgstr "%1 Tage"
 
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
 msgstr "Anwendungsdetails"
 
-#: ../inc/host.inc:171
+#: ../inc/host.inc:170
 msgid "Show"
 msgstr "Zeige"
 
-#: ../inc/host.inc:181 ../inc/host.inc:336 ../inc/user.inc:152
+#: ../inc/host.inc:180 ../inc/host.inc:341 ../inc/user.inc:155
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../inc/host.inc:185 ../inc/host.inc:206
+#: ../inc/host.inc:184 ../inc/host.inc:206
 msgid "Number of times client has contacted server"
 msgstr "Anzahl der Verbindungen zum Server"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
 msgstr "letztmaliger Kontakt mit Server"
 
-#: ../inc/host.inc:187
-msgid "% of time BOINC is running"
-msgstr "% der Gesamtlaufzeit von BOINC"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
+msgstr "Anteil der Gesamtlaufzeit von BOINC"
+
+#: ../inc/host.inc:188
+msgid ""
+"While BOINC is running, fraction of time computer has an Internet connection"
+msgstr "Verfügbarkeit der Internetverbindung, während BOINC lief"
 
-#: ../inc/host.inc:189
-msgid "While BOINC running, % of time host has an Internet connection"
-msgstr "Während BOINC läuft, besteht % der Zeit eine Internetverbindung"
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
+msgstr "Verfügbarkeit der Rechenleistung, während BOINC lief"
 
 #: ../inc/host.inc:191
-msgid "While BOINC running, % of time work is allowed"
-msgstr "Während BOINC läuft, sind in % der Zeit Berechnungen erlaubt"
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "Verfügbarkeit der Grafikkartenberechnung, während BOINC lief"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -717,7 +823,7 @@ msgstr "mittlere CPU-Effizienz"
 msgid "Task duration correction factor"
 msgstr "Korrekturfaktor der Taskdauer"
 
-#: ../inc/host.inc:198 ../inc/host.inc:674
+#: ../inc/host.inc:198 ../inc/host.inc:679
 msgid "Location"
 msgstr "Ort"
 
@@ -733,7 +839,7 @@ msgstr "Doppelte Einträge dieses Computer zusammenführen"
 msgid "Merge"
 msgstr "Zusammenführen"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
 msgstr "Letzter Kontakt"
 
@@ -741,30 +847,30 @@ msgstr "Letzter Kontakt"
 msgid "Computer info"
 msgstr "Informationen zum Computer"
 
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
+#: ../inc/host.inc:221 ../inc/host.inc:681 ../inc/team.inc:366
 #: ../user/top_users.php:48
 msgid "Rank"
 msgstr "Rang"
 
-#: ../inc/host.inc:225 ../inc/host.inc:679
+#: ../inc/host.inc:225 ../inc/host.inc:684
 msgid "Avg. credit"
 msgstr "Punktedurchschnitt"
 
-#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
-#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
-#: ../inc/team.inc:368 ../inc/user.inc:139
-#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:64
-#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
+#: ../inc/host.inc:230 ../inc/team.inc:106 ../inc/team.inc:225
+#: ../inc/team.inc:234 ../inc/team.inc:236 ../inc/team.inc:372
+#: ../inc/team.inc:377 ../inc/user.inc:140
+#: ../user/team_change_founder_form.php:81 ../user/team_email_list.php:73
+#: ../user/team_remove_inactive_form.php:44 ../user/top_users.php:53
 #: ../user/top_users.php:58
 msgid "Recent average credit"
 msgstr "aktueller Punktedurchschnitt"
 
-#: ../inc/host.inc:236 ../inc/host.inc:684 ../inc/result.inc:51
+#: ../inc/host.inc:236 ../inc/host.inc:689 ../inc/result.inc:51
 #: ../user/host_app_versions.php:25
 msgid "CPU"
 msgstr "CPU"
 
-#: ../inc/host.inc:237 ../inc/host.inc:685
+#: ../inc/host.inc:237 ../inc/host.inc:690
 msgid "GPU"
 msgstr "GPU"
 
@@ -772,91 +878,83 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "Betriebssystem"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr "(%1 Prozessoren)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "Details"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
 msgstr "Projektübergreifende Statistiken:"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
 msgstr "PC %1 hat eine überschneidende Nutzungszeit:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr "PC %1 hat kein kompatibles Betriebssystem:"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr "PC %1 hat keinen kompatiblen Prozessor:"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
 msgstr "gleicher Computer"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
 msgstr "Der PC %1 kann nicht mit %2 zusammen geführt werden. Die Computer sind inkompatibel."
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr "Führe PC %1 mit %2 zusammen."
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
 msgstr "Konnte Punkte für neuen Computer nicht aktualisieren."
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
 msgstr "Aufgaben konnten nicht aktualisiert werden"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
 msgstr "Konnte den alten Computer nicht zur Ruhe setzen"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
 msgstr "Setze Computer %1 zur Ruhe"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "Zeige:"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
 msgstr "Alle Computer"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Only computers active in past 30 days"
 msgstr "Nur aktive Computer der letzten 30 Tage"
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr "Computer ID"
 
-#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:210
-#: ../inc/team.inc:358 ../inc/user.inc:199 ../user/account_finish.php:41
-#: ../user/create_account_form.php:79 ../user/team_admins.php:62
-#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
-#: ../user/top_users.php:49 ../user/user_search.php:139
-msgid "Name"
-msgstr "Name"
-
-#: ../inc/host.inc:682
+#: ../inc/host.inc:687
 msgid "BOINC<br>version"
 msgstr "BOINC<br>Version"
 
-#: ../inc/host.inc:745 ../user/merge_by_name.php:65
+#: ../inc/host.inc:750 ../user/merge_by_name.php:65
 msgid "Merge computers by name"
 msgstr "Computer nach Namen zusammen führen"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
 msgstr "Browsereinstellung"
 
@@ -869,29 +967,29 @@ msgstr "Kommentar"
 msgid "News is available as an %sRSS feed%s"
 msgstr "Nachrichten sind auch als %sRSS feed%s verfügbar."
 
-#: ../inc/pm.inc:25 ../inc/pm.inc:174 ../user/pm.php:69 ../user/pm.php:148
+#: ../inc/pm.inc:25 ../inc/pm.inc:176 ../user/pm.php:69 ../user/pm.php:153
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
 msgid "Write"
 msgstr "Schreiben"
 
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:458
 msgid "Send private message"
 msgstr "Private Nachricht versenden"
 
 #: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
 #: ../user/ffmail_form.php:58 ../user/forum_edit.php:99
 #: ../user/forum_edit.php:101 ../user/forum_edit.php:145
-#: ../user/forum_post.php:61 ../user/forum_post.php:87
-#: ../user/forum_post.php:89 ../user/forum_post.php:130
-#: ../user/forum_reply.php:74 ../user/forum_reply.php:107
-#: ../user/forum_reply.php:109 ../user/forum_reply.php:165 ../user/pm.php:181
+#: ../user/forum_post.php:65 ../user/forum_post.php:91
+#: ../user/forum_post.php:93 ../user/forum_post.php:134
+#: ../user/forum_reply.php:77 ../user/forum_reply.php:110
+#: ../user/forum_reply.php:115 ../user/forum_reply.php:171 ../user/pm.php:186
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../inc/pm.inc:48 ../user/pm.php:131
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
 msgstr "Keine entsprechende Nachricht gefunden"
 
@@ -903,7 +1001,7 @@ msgstr "An"
 msgid "User IDs or unique usernames, separated with commas"
 msgstr "Benutzer-IDs oder eindeutige Benutzernamen, durch Kommas getrennt"
 
-#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:139
+#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:144
 msgid "Subject"
 msgstr "Betreff"
 
@@ -911,373 +1009,499 @@ msgstr "Betreff"
 msgid "Send message"
 msgstr "Nachricht senden"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
 msgstr "hat dir eine private Nachricht gesendet; Betreff:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
 msgstr "Private Nachricht%1 von %2; Betreff:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
 msgstr "Nachricht konnte nicht erstellt werden."
 
-#: ../inc/pm.inc:166
+#: ../inc/pm.inc:168
 msgid ""
 "You are not allowed to send privates messages so often. Please wait some "
 "time before sending more messages."
 msgstr "Sie dürfen nicht in so kurzen Abständen private Nachrichten versenden. Bitte warten Sie ein wenig, bis Sie weitere Nachrichten versenden."
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "ungelesen"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
 msgstr "E-Mail Benachrichtigungen in den %1Communityeinstellungen%2 einrichten."
 
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "Private Nachricht"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "Nutzungsbegrenzungen"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "Nutze höchstens"
+
+#: ../inc/prefs.inc:49
+#, no-php-format
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr "Ausführung anhalten bei Batteriebetrieb? %1 (gilt nur für tragbare Computer) %2"
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
+msgstr "Erlaubt es einige Prozessoren für andere Anwendungen zu reservieren. Beispiel: 75% benutzt nur 6 Kerne eines 8 Kern Prozessors."
 
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
-msgstr "Ausführung anhalten wenn der Computer benutzt wird?"
+#: ../inc/prefs.inc:52
+#, no-php-format
+msgid "% of the CPUs"
+msgstr "% der Prozessoren"
 
-#: ../inc/prefs.inc:91
+#: ../inc/prefs.inc:57
+#, no-php-format
 msgid ""
-"Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr "Ausführung auf Grafikkarte anhalten wenn der Computer benutzt wird? %1 Unterstützt ab Version 6.6.21 %2"
+"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 "Die Berechnung alle paar Sekunden pausieren/fortsetzen um die Prozessortemperatur und den Energieverbrauch zu senken. Beispiel: 75% bedeutet 3 Sekunden zu rechnen und 1 Sekunde zu warten."
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
-msgstr "'In Benutzung' bedeutet Maus/Tastatur Aktivitäten in den letzten"
+#: ../inc/prefs.inc:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% der Prozessorzeit"
 
-#: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
-msgid "minutes"
-msgstr "Minuten"
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "Wann pausiert werden soll"
 
-#: ../inc/prefs.inc:105
-msgid ""
-"Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
-"power mode on some computers %2"
-msgstr "Arbeit unterbrechen wenn keine Maus-/Tastaturaktivität für %1 Wird bei manchen PC zur Umschaltung in den Ruhemodus benötigt %2"
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "Pausieren, während Rechner im Akku-Betrieb läuft"
 
-#: ../inc/prefs.inc:114
+#: ../inc/prefs.inc:65
 msgid ""
-"Suspend work when non-BOINC CPU usage is above %1 0 means no "
-"restriction<br>Enforced by version 6.10.30+ %2"
-msgstr "Arbeit anhalten solange die CPU-Last (nicht von BOINC) größer ist als %1 0 bedeutet keine Einschränkung<br>Unterstützt ab Version 6.10.30+ %2"
+"Check this to suspend computing on portables when running on battery power."
+msgstr "Anklicken, damit die Berechnung pausiert, während der Rechner im Akku-Betrieb läuft."
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr "Erlaube Arbeit nur in der Zeit zwischen %1 Keine Einschränkung wenn gleich %2"
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "Pausieren, während Rechner in Benutzung ist"
 
-#: ../inc/prefs.inc:130
+#: ../inc/prefs.inc:71
 msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr "Angehaltene Arbeitspakete im Speicher belassen? %1 wenn 'Ja', wird Speicher in der Auslagerungsdatei belegt %2"
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Anklicken, damit die Berechnung und die Datei-Übertragung pausiert, während der Rechner in Benutzung ist."
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "Wechsle zwischen den Tasks alle %1 Empfohlen: 60 Minuten %2"
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Verwendung des Grafik-Prozessors pausieren, während der Rechner in Benutzung ist."
+
+#: ../inc/prefs.inc:77
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "Anklicken, damit die Verwendung des Grafik-Prozessors pausiert wird, während der Rechner in Benutzung ist."
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "Bei mehreren Prozessoren, nutze höchstens"
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'In Benutzung' meint Aktivität der Maus/Tastatur in den letzten"
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "Prozessoren"
+#: ../inc/prefs.inc:83
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Dies bestimmt, wann der Rechner als „in Benutzung“ angesehen wird."
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr "Bei mehreren Prozessoren, nutze höchstens %1 Unterstützt ab Version 6.1 %2"
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
+msgid "minutes"
+msgstr "Minuten"
 
-#: ../inc/prefs.inc:158
-msgid "% of the processors"
-msgstr "% der Prozessoren"
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Pausieren wenn keine Aktivität der Maus/Tastatur in den letzten"
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr "Nutze höchstens %1 Kann benutzt werden um CPU Überhitzung zu vermeiden %2"
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "Dies erlaubt einigen Rechnern, in den Energiesparmodus zu wechseln, wenn sie nicht in Benutzung sind."
 
-#: ../inc/prefs.inc:167
-msgid "% of CPU time"
-msgstr "% der Prozessorzeit"
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Pausieren, wenn die Prozessorauslastung durch andere Programme über folgenden Wert steigt:"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "Festplatte: nutze höchstens"
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Pausieren wenn der Computer mit anderen Anwendungen beschäftigt ist."
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "GB"
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "Rechne nur zwischen:"
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr "Festplatte: mindestens frei zulassen %1 Werte kleiner als %2 werden ignoriert %3"
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "Berechnungen nur während eines bestimmten Zeitraumes eines jeden Tages durchführen.   "
 
-#: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
-#: ../inc/prefs.inc:211
-msgid "% of total"
-msgstr "% von Gesamt"
+#: ../inc/prefs.inc:105 ../inc/prefs.inc:214
+#: ../user/forum_banishment_vote.php:70
+#: ../user/forum_banishment_vote_action.php:65
+#: ../user/forum_moderate_post.php:63 ../user/forum_moderate_thread.php:61
+msgid "Other"
+msgstr "Anderer"
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Sicherung der Aufgaben auf die Festplatte höchstens alle"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "Speichere mindestens"
 
-#: ../inc/prefs.inc:196
-msgid "seconds"
-msgstr "Sekunden"
+#: ../inc/prefs.inc:108
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "Speichere ausreichend Aufträge, um den Rechner so lange zu beschäftigen."
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "Auslagerungsspeicher: nutze höchstens"
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "Tage"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "Arbeitsspeicher: wenn Computer benutzt wird, nutze höchstens"
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "Speichere zusätzlich für weitere"
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "Arbeitsspeicher: wenn Computer nicht genutzt wird, nutze höchstens"
+#: ../inc/prefs.inc:114
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "Speichere zusätzliche Aufgaben über dem Minimum. Bestimmt wie viele Aufgaben beim Kontakt mit dem Projekt angefordert werden."
 
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr "Genug Aufgaben für mindestens X Tage vorhalten%1(max. 10 Tage)%2."
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+msgstr "Zwischen Aufträgen wechseln etwa alle"
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr "Tage"
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "Wenn Sie mehrere Projekte bearbeiten, dann darf BOINC zwischen diesen so häufig wechseln."
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... und zusätzlich für weitere"
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "Sicherung der Aufgaben höchstens alle"
 
-#: ../inc/prefs.inc:232
+#: ../inc/prefs.inc:126
 msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr "Bestätigen vor Verbindungsaufbau zum Internet? %1 Nur für Modem, ISDN oder VPN Verbindungen nötig. %2"
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "Dies bestimmt wie oft Aufgaben auf die Festplatte gesichert werden, damit diese später fortgesetzt werden können."
 
-#: ../inc/prefs.inc:241
-msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr "Trennen wenn Aufgabe/n erledigt? %1 Nur für Modem, ISDN oder VPN Verbindungen nötig.%2"
+#: ../inc/prefs.inc:128
+msgid "seconds"
+msgstr "Sekunden"
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "Maximale Downloadrate:"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "Nutze nicht mehr als:"
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr "kB/s"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "Beschränke den Festplattenplatz, den BOINC benutzt."
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "Maximale Uploadrate:"
+#: ../inc/prefs.inc:139
+msgid "GB"
+msgstr "GB"
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr "Nutze das Netzwerk nur in der Zeit von/bis"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "Lasse mindestens"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "Übertrage höchstens %1 Unterstützt ab Version 6.10.46 %2"
+#: ../inc/prefs.inc:143
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Begrenzung des Festplattenplatzes damit so viel Speicher auf dem von BOINC genutzten Datenträger freibleibt."
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "MB pro"
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB frei:"
 
-#: ../inc/prefs.inc:274
+#: ../inc/prefs.inc:149
 msgid ""
-"Skip image file verification? %1 Check this ONLY if your Internet provider "
-"modifies image files (UMTS does this, for example). %2 Skipping verification"
-" reduces the security of BOINC. %3"
-msgstr "Bild-Dateien nicht prüfen? %1 Nur wählen, wenn der Internetanbieter Bilddateien verändert (z.B. bei UMTS). %2 Überspringen der Prüfung verringert die BOINC-Sicherheit. %3"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "Prozentuale begrenzung des Festplattenplatzes den BOINC auf dem Datenträger nutzen darf."
 
-#: ../inc/prefs.inc:287
-msgid ""
-"Resource share %1 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. %2"
-msgstr "Ressourcenverteilung %1 Bestimmt den Anteil an den Ressourcen des Computer die diesem Projekt zur Verfügung stehen. Beispiel: Bei einer Aufteilung zwischen zwei Projekten von 100 und 200 wird das erste 1/3 der Ressourcen bekommen und das andere 2/3. %2"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% von Gesamt"
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr "Beschleunige Berechnung, durch Bereitstellung jeweils einer CPU je GPU?"
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "Wenn der Computer benutzt wird, nutze höchstens"
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "Benutze CPU %1 Unterstützt ab Version 6.10 %2"
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "Begrenzung des Arbeitsspeichers welcher von BOINC genutzt wird, während der Computer anderweitig genutzt wird."
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "Benutze ATI GPU %1 Unterstützt ab Version 6.10 %2"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "Benutze Nvidia GPU %1 Unterstützt ab Version 6.10 %2"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "Wenn der Computer nicht genutzt wird, nutze höchstens"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Benutze Intel GPU %1 Unterstützt ab Version 7.2 %2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Begrenzung des Arbeitsspeichers welcher von BOINC genutzt wird, während der Computer nicht anderweitig genutzt wird."
 
-#: ../inc/prefs.inc:358
-msgid ""
-"Run test applications? %1 This helps us develop applications, but may cause "
-"jobs to fail on your computer %2"
-msgstr "Testanwendungen erlauben? %1 Dies hilft uns, Anwendungen zu verbessern, kann aber zu Fehlern/Abstürzen des Computers führen %2"
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Lasse nicht-GPU Aufgaben im Speicher, wenn sie pausiert sind"
 
-#: ../inc/prefs.inc:367
+#: ../inc/prefs.inc:173
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this "
-"address."
-msgstr "E-Mails werden von %1 gesendet; Bitte sicher stellen, dass der Spamfilter diese Adresse akzeptiert."
+"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 "Wenn ausgewählt verbleiben pausierte Aufgaben im Speicher und können ohne Verlust fortgesetzt werden. Wenn nicht ausgewählt wird der Speicher freigegeben und die Aufgaben vom letzten Sicherungspunkt fortgesetzt."
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "Ist es OK für %1 und Dein Team (wenn beigetreten) Dich per E-Mail zu kontaktieren?"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "Auslagerungsspeicher: nutze höchstens"
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "Sollen deine Computer auf der %1 Webseite angezeigt werden?"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Beschränke den Auslagerungsspeicher (die Auslagerungsdatei), den BOINC benutzt."
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "Festplatten- und Speichernutzung"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "Begrenze Downloadrate auf"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "Prozessornutzung"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "Begrenzt die Downloadrate von Dateiübertragungen."
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "Netzwerknutzung"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "KB/Sekunde"
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr "Diese Einstellung werden für alle BOINC-Projekte an denen Du teilnimmst verwendet."
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr "Begrenze Uploadrate auf"
 
-#: ../inc/prefs.inc:395
-msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of"
-" range or not numeric."
-msgstr "%1 Einstellungen aktualisieren nicht möglich! %2 Die rot markierten Werte sind außerhalb zulässiger Werte oder nicht numerisch!"
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "Begrenzt die Uploadrate von Dateiübertragungen."
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "fehlerhafter Ort: %1"
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "Begrenze Datentransfer auf"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "fehlerhafte Teilmenge: %1"
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Beispiel: BOINC darf höchstens 2000 MB Daten alle 30 Tage übertragen."
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1025
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:85
-msgid "yes"
-msgstr "ja"
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "MB pro"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1027
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:87
-msgid "no"
-msgstr "nein"
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
+msgid "days"
+msgstr "Tage"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "keine Einschränkung"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "Dateien übertragen zwischen:"
 
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "Erlaubt Dateiübertragungen nur innerhalb einer täglichen Zeitspanne."
 
-#: ../inc/prefs.inc:706 ../inc/prefs.inc:834
-#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34
-msgid "Remove"
-msgstr "Entfernen"
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "Die Datenverifikation von Bildern überspringen."
+
+#: ../inc/prefs.inc:217
+msgid ""
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "Nur auswählen wenn der Internetprovider Bilder verändert. Das Überspringen der Verifikation reduziert die Sicherheit von BOINC."
+
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "Bestätigen, bevor mit dem Internet verbunden wird."
+
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Nur nützlich wenn Sie eine Verbindung via Modem, ISDN oder VPN aufbauen."
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "Verbindung trennen, wenn fertig"
+
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
 msgid "Computing"
 msgstr "Berechnung"
 
-#: ../inc/prefs.inc:823
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "Festplatte"
+
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "Netzwerk"
+
+#: ../inc/prefs.inc:241
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "Diese Einstellung werden für alle BOINC-Projekte an denen Sie teilnehmen verwendet."
+
+#: ../inc/prefs.inc:244
+msgid ""
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1 Einstellungen aktualisieren nicht möglich! %2 Die rot markierten Werte sind außerhalb zulässiger Werte oder nicht numerisch!"
+
+#: ../inc/prefs.inc:483
 msgid "Separate preferences for %1"
 msgstr "Separate Einstellungen für %1"
 
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
+#: ../inc/prefs.inc:493 ../inc/prefs.inc:528 ../inc/prefs_project.inc:291
 msgid "Edit preferences"
 msgstr "Einstellungen bearbeiten"
 
-#: ../inc/prefs.inc:839
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../inc/prefs.inc:499
 msgid "Add separate preferences for %1"
 msgstr "Separate Einstellungen für %1 hinzufügen"
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "Diese Einstellungen sind für alle Computer dieses Kontos gültig, außer"
+
+#: ../inc/prefs.inc:508
+msgid ""
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "Computer, bei welchen mittels des BOINC Managers lokale Einstellungen gespeichert wurden"
+
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Android Geräten"
+
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
 msgstr "(Ansicht wechseln)"
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
 msgid "Combined preferences"
 msgstr "kombinierte Einstellungen"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr "Projektspezifische Einstellungen"
-
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
 msgid "Primary (default) preferences"
 msgstr "Primäreinstellungen (Standard)"
 
-#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
-#: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64
-#: ../user/prefs_edit.php:92
-msgid "Edit %1 preferences"
-msgstr "%1 Einstellungen bearbeiten"
+#: ../inc/prefs.inc:537
+msgid "Preferences last modified:"
+msgstr "Letzte Änderung:"
+
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
+msgstr "Einstellungen hinzufügen"
+
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
+msgstr "Einstellungen aktualisieren"
+
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "ja"
+
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
+msgstr "nein"
+
+#: ../inc/prefs.inc:638
+msgid "Default computer location"
+msgstr "Computerstandort (Standard)"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr "Diese gelten für alle BOINC Projekte an denen Sie teilnehmen."
+#: ../inc/prefs.inc:639
+msgid ""
+"New computers will use this location for computing and project preferences."
+msgstr "Neue Computer werden diesen Standort für die Einstellungen benutzen."
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Ressourcenaufteilung"
+
+#: ../inc/prefs_project.inc:53
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr "Nimmt ein Rechner an mehreren Projekten teil, werden die neuesten Einstellungen verwendet."
+"Determines the proportion of your computer's resources allocated to this "
+"project. For 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 "Bestimmt den Anteil an den Ressourcen des Computer die diesem Projekt zur Verfügung stehen. Beispiel: Bei einer Aufteilung zwischen zwei Projekten von 100 und 200 wird das erste 1/3 der Ressourcen bekommen und das andere 2/3."
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr "Diese Einstellungen gelten nicht für Android-Geräte."
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Beschleunige Berechnung, durch Bereitstellung jeweils einer CPU je GPU?"
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr "Letzte Änderung:"
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "CPU benutzen"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "ATI-Grafikprozessor benutzen"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "NVIDIA-Grafikprozessor benutzen"
+
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Intel-Grafikprozessor benutzen"
+
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "Die Ausführung von Testanwendung erlauben?"
+
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "Dies hilft uns, Anwendungen zu verbessern, kann aber zu fehlerhaften Aufgaben auf Ihrem Computers führen"
+
+#: ../inc/prefs_project.inc:115
+msgid ""
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "E-Mails werden von %1 gesendet; Bitte sicher stellen, dass der Spamfilter diese Adresse akzeptiert."
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "Ist es OK für %1 und Dein Team (wenn beigetreten) Dich per E-Mail zu kontaktieren?"
+
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "Sollen deine Computer auf der %1 Webseite angezeigt werden?"
+
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Ansicht wechseln)"
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr "Einstellungen hinzufügen"
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Projektspezifische Einstellungen"
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr "Einstellungen aktualisieren"
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "fehlerhafter Ort: %1"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr "Computerstandort (Standard)"
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "fehlerhafte Teilmenge: %1"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "und"
 
@@ -1293,7 +1517,7 @@ msgid ""
 "people. Please change it."
 msgstr "Dein Profil wurde als unakzeptable markiert. Es ist für niemanden einsehbar. Bitte verändere es."
 
-#: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
+#: ../inc/profile.inc:172 ../user/friend.php:107 ../user/friend.php:174
 msgid "Database error"
 msgstr "Datenbankfehler"
 
@@ -1311,7 +1535,7 @@ msgstr "Benutzer ist gesperrt"
 msgid "No profile exists for that user ID."
 msgstr "Es existiert kein Profil für diese Benuzer-ID."
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
 msgstr "Profil bearbeiten"
 
@@ -1359,11 +1583,12 @@ msgstr "Nicht in der Datenbank"
 msgid "pending"
 msgstr "ausstehend"
 
-#: ../inc/result.inc:114 ../user/forum_search.php:60
+#: ../inc/result.inc:114 ../user/forum_search.php:62
 msgid "All"
 msgstr "Alle"
 
 #: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
 msgid "In progress"
 msgstr "In Bearbeitung"
 
@@ -1392,6 +1617,7 @@ msgid "Inactive"
 msgstr "Inaktiv"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
 msgstr "Ungesendet"
 
@@ -1556,127 +1782,135 @@ msgid "WU cancelled"
 msgstr "Paket abgebrochen"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "autorisiertes Ergebnis fehlt"
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
 msgstr "Unbekannter Fehler: %1"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Task name"
 msgstr "Paketname"
 
-#: ../inc/result.inc:349 ../inc/result.inc:354 ../inc/result.inc:357
-#: ../inc/result.inc:360
+#: ../inc/result.inc:353 ../inc/result.inc:358 ../inc/result.inc:361
+#: ../inc/result.inc:364
 msgid "click for details"
 msgstr "anklicken für Einzelheiten"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Show IDs"
 msgstr "Zeige IDs"
 
-#: ../inc/result.inc:354
+#: ../inc/result.inc:358
 msgid "Show names"
 msgstr "Zeige Namen"
 
-#: ../inc/result.inc:357
+#: ../inc/result.inc:361
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
 msgstr "Arbeitspaket"
 
-#: ../inc/result.inc:369
+#: ../inc/result.inc:373
 msgid "Computer"
 msgstr "Computer"
 
-#: ../inc/result.inc:372 ../inc/result.inc:631
+#: ../inc/result.inc:376 ../inc/result.inc:635
 msgid "Sent"
 msgstr "Gesendet"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
 msgstr "Meldezeit<br />oder Ablaufdatum"
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
 msgstr "Erklärung"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
 msgstr "Status"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
 msgstr "Laufzeit<br />(sek)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr "CPU Zeit<br />(sek)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
 msgstr "Punkte"
 
-#: ../inc/result.inc:380 ../inc/result.inc:724
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:163
 msgid "Application"
 msgstr "Anwendung"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
 msgstr "Arbeitspaket"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "Ablaufdatum"
+
+#: ../inc/result.inc:637
 msgid "Received"
 msgstr "Empfangen"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
 msgstr "Serverstatus"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
 msgstr "Resultat"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
 msgstr "Clientstatus"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
 msgstr "Endstatus"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "Ablaufdatum"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
 msgstr "Laufzeit"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
 msgstr "CPU Zeit"
 
-#: ../inc/result.inc:641
+#: ../inc/result.inc:645
 msgid "Validate state"
 msgstr "Prüfungsstatus"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "max. FLOPS des Gerätes"
+
+#: ../inc/result.inc:648
 msgid "Application version"
 msgstr "Anwendungsversion"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
 msgstr "Ausgabedateien"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
 msgstr "Stderr Ausgabe"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "Status"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
 msgstr "Aufgabenname:"
 
@@ -1692,17 +1926,7 @@ msgstr "Schlagwörter"
 msgid "Find teams with these words in their names or descriptions"
 msgstr "Findet Teams mit diesen Begriffen im Namen oder der Beschreibung."
 
-#: ../inc/team.inc:43 ../inc/team.inc:122 ../inc/team.inc:233
-#: ../inc/team.inc:373 ../inc/team.inc:455 ../inc/user.inc:205
-#: ../inc/user.inc:317 ../user/account_finish.php:45
-#: ../user/create_account_form.php:98 ../user/edit_user_info_form.php:38
-#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
-#: ../user/team_search.php:72 ../user/top_users.php:63
-#: ../user/user_search.php:53 ../user/user_search.php:140
-msgid "Country"
-msgstr "Land"
-
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:468
 msgid "Type of team"
 msgstr "Typ des Teams"
 
@@ -1710,7 +1934,7 @@ msgstr "Typ des Teams"
 msgid "Show only active teams"
 msgstr "Nur aktive Teams anzeigen"
 
-#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:78 ../user/user_search.php:70
 msgid "Search"
 msgstr "Suche"
 
@@ -1730,8 +1954,8 @@ msgstr "Von Ihnen angefordert"
 msgid "founder response deadline is %1"
 msgstr "Die Rückmeldezeit des Gründers beträgt %1"
 
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
+#: ../inc/team.inc:72 ../inc/team.inc:570 ../inc/user.inc:358
+#: ../inc/user.inc:449
 msgid "None"
 msgstr "Keines"
 
@@ -1747,486 +1971,477 @@ msgstr "laufende Übernahme"
 msgid "Team info"
 msgstr "Team Informationen"
 
-#: ../inc/team.inc:89 ../user/team_forum.php:70 ../user/team_search.php:69
+#: ../inc/team.inc:89 ../user/team_forum.php:72 ../user/team_search.php:82
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:101
 msgid "Web site"
 msgstr "Internetseite"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:127
 msgid "Cross-project stats"
 msgstr "Projektübergreifende Statistiken"
 
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:130 ../inc/team.inc:383 ../user/team_search.php:84
 msgid "Type"
 msgstr "Typ"
 
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:134 ../user/team_manage.php:65
 msgid "Message board"
 msgstr "Diskussionsforen"
 
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:135 ../user/forum_forum.php:138 ../user/forum_index.php:98
 msgid "Threads"
 msgstr "Themen"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:143
 msgid "Join this team"
 msgstr "Diesem Team beitreten"
 
-#: ../inc/team.inc:137
+#: ../inc/team.inc:144
 msgid ""
 "Note: if 'OK to email' is set in your project preferences, joining a team "
 "gives its founder access to your email address."
 msgstr "Hinweis: Wenn Sie E-Mails in den Projekteinstellungen erlauben, kann der Gründer des Teams Ihre E-Mail-Adresse einsehen."
 
-#: ../inc/team.inc:140
+#: ../inc/team.inc:147
 msgid "Not accepting new members"
 msgstr "Akzeptiert keine neuen Mitglieder"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:154
 msgid "Foundership change requested"
 msgstr "Wechsel des Gründerstatus beantragt"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:155
 msgid "Respond by %1"
 msgstr "Rückmeldung bis %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:159
 msgid "Team foundership change"
 msgstr "Teamgründer wechseln"
 
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:163 ../inc/team.inc:368
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:164 ../inc/team.inc:263
 msgid "Founder"
 msgstr "Gründer"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:178
 msgid "Admins"
 msgstr "Team-Admins"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:193
 msgid "New members in last day"
 msgstr "Neue Mitglieder (letzte 24h)"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:194
 msgid "Total members"
 msgstr "Mitglieder insgesamt"
 
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:194 ../inc/team.inc:195 ../inc/team.inc:196
 msgid "view"
 msgstr "Anzeigen"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:195
 msgid "Active members"
 msgstr "aktive Mitglieder"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:196
 msgid "Members with credit"
 msgstr "Mitglieder mit Punkten"
 
-#: ../inc/team.inc:256
+#: ../inc/team.inc:265
 msgid "Admin"
 msgstr "Admin"
 
-#: ../inc/team.inc:277 ../user/forum_user_posts.php:122
-#: ../user/top_hosts.php:93 ../user/top_teams.php:121
-#: ../user/top_users.php:127
+#: ../inc/team.inc:286 ../user/forum_user_posts.php:124
+#: ../user/top_hosts.php:93 ../user/top_teams.php:123
+#: ../user/top_users.php:128
 msgid "Previous %1"
 msgstr "Vorherige %1"
 
-#: ../inc/team.inc:281 ../user/forum_user_posts.php:131
-#: ../user/profile_search_action.php:61 ../user/top_hosts.php:98
-#: ../user/top_teams.php:126 ../user/top_users.php:132
+#: ../inc/team.inc:290 ../user/forum_user_posts.php:133
+#: ../user/profile_search_action.php:63 ../user/top_hosts.php:98
+#: ../user/top_teams.php:128 ../user/top_users.php:133
 msgid "Next %1"
 msgstr "Nächste %1"
 
-#: ../inc/team.inc:289
+#: ../inc/team.inc:298
 msgid "No such team."
 msgstr "Kein Team gefunden."
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:311
 msgid "This operation requires foundership."
 msgstr "Diese Aktion benötigt den Gründerstatus."
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:335
 msgid "This operation requires team admin privileges"
 msgstr "Diese Aktion benötigt die Team-Admin Berechtigung."
 
-#: ../inc/team.inc:422
+#: ../inc/team.inc:437
 msgid ""
 "WARNING: this is a BOINC-wide team. If you make changes here, they will soon"
 " be overwritten. Edit the %1BOINC-wide team%2 instead."
-msgstr "WARNUNG: dies ist ein BOINC-weites Team. Hier vorgenommene Änderungen werden automatisch wieder überschrieben. Bearbeite das %1BOINC-weite Team%2 stattdessen."
+msgstr "WARNUNG: Dies ist ein BOINC-weites Team. Hier vorgenommene Änderungen werden automatisch wieder überschrieben. Bearbeiten Sie das %1BOINC-weite Team%2 stattdessen."
 
-#: ../inc/team.inc:428
+#: ../inc/team.inc:443
 msgid ""
 "%1Privacy note%2: if you create a team, your project preferences (resource "
 "share, graphics preferences) will be visible to the public."
 msgstr "%1Datenschutzhinweis%2: Wenn Sie ein Team erstellen, werden Ihre Projekteinstellungen (Ressourcenverteilung, Grafikeinstellungen) für jeden sichtbar."
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
 msgstr "Teamname (Textversion)"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:448
 msgid "Don't use HTML tags."
 msgstr "Keine HTML-Tags möglich."
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
 msgstr "Teamname (HTML-Version)"
 
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:453 ../inc/team.inc:463
 msgid "You may use %1limited HTML tags%2."
 msgstr "Sie können nur %1bestimmte HTML-Tags%2 verwenden."
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
 msgstr "Wenn Sie HTML nicht kennen, lassen Sie dieses Feld frei."
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
 msgstr "URL der Team-Internetseite, wenn vorhanden"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "without \"http://\""
 msgstr "ohne \"http://\""
 
-#: ../inc/team.inc:443
+#: ../inc/team.inc:458
 msgid "This URL will be linked to from the team's page on this site."
 msgstr "Diese URL wird als Link zur Team-Internetseite benutzt."
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:461
 msgid "Description of team"
 msgstr "Beschreibung des Teams"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:477
 msgid "Accept new members?"
 msgstr "Neue Mitglieder akzeptieren?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
 msgstr "Benutzerprofil"
 
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
 msgstr "Projekte bei denen Sie teilnehmen"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
 msgstr "Projekte bei denen %1 teilnimmt"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Project"
 msgstr "Projekt"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Click for user page"
 msgstr "Anklicken für mehr Infos"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
 msgstr "Seit"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
 msgstr "Berechnungen und Punkte"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
 msgstr "Computer, die zu diesem Konto gehören"
 
-#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
-#: ../user/view_profile.php:64
+#: ../inc/user.inc:154 ../inc/user.inc:155 ../inc/user.inc:233
+#: ../inc/user.inc:312 ../inc/user.inc:407 ../inc/user.inc:482
+#: ../user/view_profile.php:66
 msgid "View"
 msgstr "Anzeigen"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
 msgstr "Projektübergreifende ID"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
 msgstr "Projektübergreifende Statistiken"
 
-#: ../inc/user.inc:163
+#: ../inc/user.inc:166
 msgid "Account"
 msgstr "Konto"
 
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:168 ../inc/user.inc:358 ../inc/user.inc:447
+#: ../inc/user.inc:449 ../user/user_search.php:124
 msgid "Team"
 msgstr "Team"
 
-#: ../inc/user.inc:167
+#: ../inc/user.inc:170
 msgid "Cross-project"
 msgstr "Projektübergreifend"
 
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
+#: ../inc/user.inc:171
 msgid "Certificate"
 msgstr "Urkunde"
 
-#: ../inc/user.inc:169
+#: ../inc/user.inc:172
 msgid "Stats on your cell phone"
 msgstr "Statistiken auf Ihrem Mobiltelefon"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr "Unbekannter Nachrichtentyp: %1"
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
 msgstr "Kontoinformationen"
 
-#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
-#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
+#: ../inc/user.inc:206 ../user/get_passwd.php:31
+#: ../user/team_email_list.php:73
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:210 ../inc/user.inc:400
 msgid "URL"
 msgstr "URL"
 
-#: ../inc/user.inc:206
+#: ../inc/user.inc:213
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
 msgstr "%1 Mitglied seit"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
 msgstr "Ändern"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
 msgstr "E-Mail-Adresse"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
 msgstr "Passwort"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
 msgstr "Andere Kontoinformationen"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
 msgstr "Benutzer ID"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
 msgstr "für Community Funktionen"
 
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "Kontoschlüssel"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
 msgstr "Wann und wie BOINC Ihren Computer verwenden darf"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
 msgstr "Berechnungseinstellungen"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
 msgstr "Diskussionsforen und Private Nachrichten"
 
-#: ../inc/user.inc:229 ../user/edit_forum_preferences_form.php:31
+#: ../inc/user.inc:245 ../user/edit_forum_preferences_form.php:31
 msgid "Community preferences"
 msgstr "Communityeinstellungen"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
 msgstr "Einstellungen für dieses Projekt"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
 msgstr "%1 Einstellungen"
 
-#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../inc/user.inc:266
+msgid "View the profile of %1"
+msgstr "Das Profil von %1 anzeigen"
+
+#: ../inc/user.inc:267 ../inc/user.inc:316 ../inc/user.inc:482
+msgid "Profile"
+msgstr "Profil"
+
+#: ../inc/user.inc:307 ../user/sample_index.php:114
 msgid "Community"
 msgstr "Community"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "Erstellen"
 
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
-msgid "Profile"
-msgstr "Profil"
-
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:321 ../inc/user.inc:454
 msgid "%1 posts"
 msgstr "%1 Beiträge"
 
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:339 ../user/edit_forum_preferences_form.php:40
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../inc/user.inc:269
+#: ../inc/user.inc:346
 msgid "Quit team"
 msgstr "Team verlassen"
 
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:348 ../inc/user.inc:365
 msgid "Administer"
 msgstr "Verwalten"
 
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:354 ../inc/user.inc:367
 msgid "(foundership change request pending)"
 msgstr "(ausstehender Gründerwechsel)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
 msgstr "Mitglied im Team"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
 msgstr "Team finden"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
 msgstr "Gründer aber nicht Mitglied von"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
 msgstr "Freunde finden"
 
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
+#: ../inc/user.inc:383 ../inc/user.inc:385 ../inc/user.inc:465
+#: ../inc/user.inc:467 ../inc/user.inc:476
 msgid "Friends"
 msgstr "Freunde"
 
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
+#: ../inc/user.inc:407 ../inc/user.inc:409 ../user/server_status.php:153
 msgid "Computers"
 msgstr "Computer"
 
-#: ../inc/user.inc:338
+#: ../inc/user.inc:415
 msgid "Donor"
 msgstr "Spender"
 
-#: ../inc/user.inc:378
+#: ../inc/user.inc:458
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../inc/user.inc:381
+#: ../inc/user.inc:461
 msgid "This person is a friend"
 msgstr "Diese Person ist ein Freund"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
 msgstr "Freundschaft aufheben"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
 msgstr "Anfrage läuft"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
 msgstr "als Freund hinzufügen"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
 msgstr "Der Benutzername kann keine Leerzeichen am Anfang oder Ende beinhalten"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
 msgstr "Der Benutzername darf nicht leer sein."
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
 msgstr "Der Benutzername darf keine HTML-Tags beinhalten."
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
 msgstr "Abmelden"
 
-#: ../inc/util.inc:133
+#: ../inc/util.inc:163
 msgid "log in"
 msgstr "Anmelden"
 
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
-msgid "Log in"
-msgstr "Anmelden"
-
-#: ../inc/util.inc:205 ../user/create_account_form.php:40
+#: ../inc/util.inc:239 ../user/create_account_form.php:41
 msgid "Create an account"
 msgstr "Konto erstellen"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
 msgstr "Serverstatus"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
 msgstr "Ein Datenbankfehler ist bei Ihrer Anfrage aufgetreten. Bitte versuchen Sie es später noch einmal."
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
 msgstr "Verarbeitung der Anfrage nicht möglich"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
 msgstr "Stunden"
 
-#: ../inc/util.inc:280
+#: ../inc/util.inc:309
 msgid "min"
 msgstr "min."
 
-#: ../inc/util.inc:283
+#: ../inc/util.inc:312
 msgid "sec"
 msgstr "sek."
 
-#: ../inc/util.inc:444
+#: ../inc/util.inc:473
 msgid ""
 "Link has timed out. Please click Back, refresh the page, and try again."
 msgstr "Die Zeit für den Aufruf der verlinkten Seite ist abgelaufen. Bitte klicken Sie in ihrem Browser auf die Taste 'Zurück', laden Sie die Seite neu und versuchen sie es erneut."
 
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "Das Profil von %1 anzeigen"
-
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr "Der Text lässt sich mit Hilfe von BBCode-Tags formatieren"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
 msgstr "Projekt wegen Wartungsarbeiten angehalten"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
 msgstr "%1 ist momentan wegen Wartungsarbeiten nicht verfügbar. Bitte versuchen Sie es später noch einmal."
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
 msgstr "Es ist momentan nicht möglich die Datenbank zu erreichen - Bitte versuchen Sie es später noch einmal."
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
 msgstr "Es ist momentan nicht möglich die Datenbank auszuwählen - Bitte versuchen Sie es später noch einmal"
 
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "verbleibende Zeichen"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
 msgstr "Auf diesem Computer angemeldet bleiben"
 
@@ -2234,22 +2449,6 @@ msgstr "Auf diesem Computer angemeldet bleiben"
 msgid "Finish account setup"
 msgstr "Kontoeinrichtung abschließen"
 
-#: ../user/account_finish.php:41 ../user/create_account_form.php:79
-msgid "Identifies you on our web site. Use your real name or a nickname."
-msgstr "Identifiziert Sie auf unserer Webseite. Verwenden Sie Ihren richtigen Namen oder einen Nicknamen."
-
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
-msgid "Select the country you want to represent, if any."
-msgstr "Wählen Sie, falls gewünscht, das Land, das Sie vertreten möchten."
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Postal or ZIP Code"
-msgstr "Postleitzahl"
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Optional"
-msgstr "Freiwillig"
-
 #: ../user/account_finish_action.php:27
 msgid "You must supply a name for your account"
 msgstr "Sie müssen einen Namen für Ihr Konto eintragen"
@@ -2258,34 +2457,38 @@ msgstr "Sie müssen einen Namen für Ihr Konto eintragen"
 msgid "HTML tags not allowed in name"
 msgstr "HTML-Tags im Namen sind nicht erlaubt"
 
-#: ../user/add_venue.php:81
+#: ../user/add_venue.php:40 ../user/add_venue.php:64 ../user/prefs_edit.php:41
+#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+msgid "Edit %1 preferences"
+msgstr "%1 Einstellungen bearbeiten"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr "%1 Einstellungen für %2 hinzufügen"
 
-#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
+#: ../user/apps.php:31 ../user/sample_index.php:104
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../user/apps.php:33
+#: ../user/apps.php:32
 msgid ""
 "%1 currently has the following applications. When you participate in %1, "
-"work for one or more of these applications will be assigned to your "
+"tasks for one or more of these applications will be assigned to your "
 "computer. The current version of the application will be downloaded to your "
 "computer. This happens automatically; you don't have to do anything."
-msgstr "Die folgenden Anwendungen gehören zur Zeit zu %1. Wenn Sie an %1 teilnehmen, wird Ihrem Computer Arbeit für eine oder mehrere dieser Anwendungen zugewiesen. Die aktuelle Version der jeweiligen Anwendung wird automatisch auf Ihren Computer heruntergeladen."
+msgstr "Die folgenden Anwendungen gehören zur Zeit zu %1. Wenn Sie an %1 teilnehmen, werden Ihrem Computer Aufgaben für eine oder mehrere dieser Anwendungen zugewiesen. Die aktuelle Version der jeweiligen Anwendung wird automatisch auf Ihren Computer heruntergeladen."
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "Plattform"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
 msgstr "Version"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "Installiert am"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "Durchschnittliche Leistung"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2316,153 +2519,79 @@ msgid "Underline"
 msgstr "unterstrichen"
 
 #: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "Durchstreichen"
+
+#: ../user/bbcode.php:36
 msgid "Superscript"
 msgstr "Hochgestellt"
 
-#: ../user/bbcode.php:36
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "Große Schrift"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
 msgstr "Rote Schrift"
 
-#: ../user/bbcode.php:38
+#: ../user/bbcode.php:39
 msgid "link to website"
 msgstr "Link zu einer Webseite"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "Quoted text"
 msgstr "Zitierter Text"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
 msgstr "Für Zitatblöcke benutzen"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
 msgstr "benutzen um ein Bild anzuzeigen"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
 msgstr "Quellcodeschnippsel hier"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
 msgstr "benutzen um Quellcode anzuzeigen"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
 msgstr "vorformatierter Text"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
 msgstr "Benutzen um vorformatierten Text (gewöhnlich in monospace Schrift) anzuzeigen"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
 msgstr "Element 1"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
 msgstr "Element 2"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
 msgstr "Element 2"
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
 msgstr "benutzen um auf ein Trac-Ticket der BOINC Webseite zu verweisen"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "benutzen um auf das Trac-Wiki der BOINC Webseite zu verlinken"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "benutzen um auf ein SVN-Changeset auf der BOINC Webseite zu verlinken"
-
-#: ../user/bbcode.php:53
+#: ../user/bbcode.php:52
 msgid ""
 "If you don't close a tag or don't specify a parameter correctly,\n"
 "the raw tag itself will display instead of the formatted text."
 msgstr "Wenn Sie einen Tag nicht korrekt schließen oder einen Parameter nicht richtig angegeben haben,\ndann werden die Tags anstatt des formatierten Textes angezeigt."
 
-#: ../user/bs_sample_index.php:44
-msgid "Participants"
-msgstr "Teilnehmer"
-
-#: ../user/bs_sample_index.php:46
-msgid "Do work"
-msgstr "Etwas tun"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-#: ../user/home.php:49 ../project.sample/project.inc:43
-msgid "Your account"
-msgstr "Ihr Konto"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-msgid "view stats, modify preferences"
-msgstr "Statistiken anschauen, Einstellungen verändern"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-#: ../user/team.php:25
-msgid "Teams"
-msgstr "Teams"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-msgid "create or join a team"
-msgstr "ein Team erstellen oder beitreten"
-
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
-msgid "User of the day"
-msgstr "Benutzer des Tages"
-
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-msgid "Server status"
-msgstr "Serverstatus"
-
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
-msgid "Profiles"
-msgstr "Profile"
-
-#: ../user/bs_sample_index.php:61
-msgid "User search"
-msgstr "Benutzersuche"
-
-#: ../user/bs_sample_index.php:64
-msgid "Statistics"
-msgstr "Statistiken"
-
-#: ../user/bs_sample_index.php:65 ../user/stats.php:30
-#: ../user/top_users.php:116
-msgid "Top participants"
-msgstr "Die besten Benutzer"
-
-#: ../user/bs_sample_index.php:66 ../user/stats.php:31
-msgid "Top computers"
-msgstr "Die besten Computer"
-
-#: ../user/bs_sample_index.php:67 ../user/stats.php:32 ../user/team.php:46
-msgid "Top teams"
-msgstr "Die besten Teams"
-
-#: ../user/bs_sample_index.php:68 ../user/gpu_list.php:182
-#: ../user/stats.php:33
-msgid "Top GPU models"
-msgstr "Beste Grafikkarten"
-
-#: ../user/bs_sample_index.php:70
-msgid "Languages"
-msgstr "Sprachen"
-
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "Unsere Regeln und Grundsätze"
-
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
 msgstr "Konto kann nicht erstellt werden"
@@ -2471,192 +2600,152 @@ msgstr "Konto kann nicht erstellt werden"
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr "Klicken Sie den <b>Zurück</b>-Knopf ihres Browser und versuchen Sie es erneut."
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
 msgstr "Ihre Antwort im reCAPTCHA war nicht korrekt. Bitte versuchen Sie es noch einmal."
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
 msgstr "Um ein Konto zu erstellen müssen Sie einen Einladungscode eingeben."
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
 msgstr "Dieser Einladungscode ist leider ungültig."
 
-#: ../user/create_account_action.php:84
+#: ../user/create_account_action.php:83
 msgid ""
 "Invalid email address: you must enter a valid address of the form "
 "name at domain"
 msgstr "Ungültige E-Mail-Adresse: Sie müssen eine gültige E-Mail-Adresse in der Form 'name at domain.tld' eingeben."
 
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:87
 msgid "There's already an account with that email address."
 msgstr "Es besteht bereits ein Konto mit dieser E-Mail-Adresse."
 
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:93 ../user/edit_passwd_action.php:32
 msgid "New passwords are different"
 msgstr "Die neuen Passwörter sind unterschiedlich"
 
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:100 ../user/edit_passwd_action.php:40
 msgid "Passwords may only include ASCII characters."
 msgstr "Passwörter dürfen nur aus ASCII-Zeichen bestehen."
 
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:105 ../user/edit_passwd_action.php:44
 msgid "New password is too short: minimum password length is %1 characters."
 msgstr "Das neue Passwort ist zu kurz: Bitte mindestens %1 Zeichen verwenden."
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
 msgstr "Das Konto konnte nicht erstellt werden."
 
-#: ../user/create_account_form.php:44
+#: ../user/create_account_form.php:45
 msgid ""
 "NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
 "select Add Project, and enter an email address and password."
 msgstr "Hinweis: Wenn Sie den BOINC Manager benutzen, dann benötigen Sie dieses Formular nicht. Starten Sie BOINC und wählen Sie Projekt hinzufügen und geben Sie dort Ihre E-Mail-Adresse und Passwort ein."
 
-#: ../user/create_account_form.php:61
+#: ../user/create_account_form.php:57
 msgid ""
 "This account will belong to the team %1 and will have the project "
 "preferences of its founder."
 msgstr "Dieses Konto wird dem Team %1 angehören und die Projekteinstellungen des Teamgründers besitzen."
 
-#: ../user/create_account_form.php:73
-msgid "Invitation Code"
-msgstr "Einladungs-Code"
-
-#: ../user/create_account_form.php:73
-msgid "A valid invitation code is required to create an account."
-msgstr "Zum Erstellen eines Kontos ist ein gültiger Einladungscode erforderlich."
-
-#: ../user/create_account_form.php:83
-msgid "Email Address"
-msgstr "E-Mail-Adresse"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "Muss eine gültige E-Mail-Adresse in der Form 'name at domain.tld' sein."
-
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
-msgid "Password"
-msgstr "Passwort"
-
-#: ../user/create_account_form.php:93
-msgid "Must be at least %1 characters"
-msgstr "Muss aus mindestens %1 Zeichen bestehen."
-
-#: ../user/create_account_form.php:96
-msgid "Confirm password"
-msgstr "Passwort bestätigen"
-
-#: ../user/create_account_form.php:113
-msgid "Please enter the words shown in the image"
-msgstr "Bitte die im Bild angezeigten Wörter eingeben"
-
-#: ../user/create_account_form.php:119
-msgid "Create account"
-msgstr "Konto erstellen"
-
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
 msgstr "Bild"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
 msgstr "%1 Ihr Profilbild wird links angezeigt."
 
-#: ../user/create_profile.php:66
+#: ../user/create_profile.php:68
 msgid ""
 "To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
 " or less)."
 msgstr "Zum Ersetzen wählen Sie eine JPG oder PNG Datei (max. %1) mit der \"Browse\" Schaltfläche aus."
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
 msgstr "Um das Bild aus Ihrem Profil zu entfernen, das Kästchen auswählen:"
 
-#: ../user/create_profile.php:77
+#: ../user/create_profile.php:79
 msgid ""
 "If you would like include a picture with your profile, click the \"Browse\" "
 "button and select a JPEG or PNG file. Please select images of %1 or less."
 msgstr "Wenn Sie Ihr Profil mit einem Bild versehen wollen, wählen Sie eine JPEG oder PNG Datei mit der \"Browse\"-Schaltfläche aus. Bitte (%1 oder kleiner)"
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
 msgstr "Sprache"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
 msgstr "Die Sprache auswählen in der Ihr Profil geschrieben ist:"
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
 msgstr "Profil speichern"
 
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr "Bitte die im Bild angezeigten Wörter eingeben."
-
-#: ../user/create_profile.php:115
+#: ../user/create_profile.php:112
 msgid "Create/edit profile"
 msgstr "Profil erstellen/bearbeiten"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
 msgstr "Das Format Ihres hochgeladenen Bildes wird nicht unterstützt."
 
-#: ../user/create_profile.php:166
+#: ../user/create_profile.php:163
 msgid ""
 "Your %1profile%2 lets you share your opinions and background with the %3 "
 "community."
-msgstr "Mit Ihrem %1Profil%2 können Sie Ihre Ansichten und Meinungen der %3 Gemeinschaft mitteilen."
+msgstr "Mit Ihrem %1Profil%2 können Sie Ihre Ansichten und Meinungen der %3 Community mitteilen."
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
 msgstr "Die reCaptcha Auswertung war nicht korrekt. Bitte versuchen Sie es erneut."
 
-#: ../user/create_profile.php:222
+#: ../user/create_profile.php:218
 msgid ""
 "Your first response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "Ihre erste Anwort wurde vom Akismet Anti-Spam-System als Spam markiert. Bitte verändern Sie Ihren Text und versuchen Sie es erneut."
 
-#: ../user/create_profile.php:230
+#: ../user/create_profile.php:226
 msgid ""
 "Your second response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "Ihre zweite Antwort wurde vom Akismet Anti-Spam-System als Spam markiert. Bitte verändern Sie Ihren Text und versuchen Sie es erneut."
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
 msgstr "Ihr übertragenes Profil war leer."
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
 msgstr "Datenbankfehler: Das Profil konnte nicht aktualisiert werden"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
 msgstr "Datenbankfehler: Das Profil konnte nicht erstellt werden"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
 msgstr "Profil gespeichert"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
 msgstr "Glückwunsch! Ihr Profil wurde in unsere Datenbank aufgenommen."
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
 msgstr "%1Ihr Profil ansehen%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
 msgstr "Profil erstellen"
 
-#: ../user/create_profile.php:343
+#: ../user/create_profile.php:339
 msgid ""
 "To prevent spam, an average credit of %1 or greater is required to create or"
 " edit a profile.  We apologize for this inconvenience."
@@ -2697,9 +2786,9 @@ msgstr "Dies kann nicht rückgängig gemacht werden.\nSobald das Konto gelöscht
 msgid "Are you sure you want to delete your account?"
 msgstr "Sind Sie wirklich sicher, dass Sie Ihr Konto löschen wollen?"
 
-#: ../user/delete_account.php:79 ../user/delete_profile.php:52
-#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238
-#: ../user/prefs_remove.php:52 ../user/user_search.php:59
+#: ../user/delete_account.php:79 ../user/delete_profile.php:54
+#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:240
+#: ../user/prefs_remove.php:53 ../user/user_search.php:59
 #: ../user/user_search.php:64
 msgid "Yes"
 msgstr "Ja"
@@ -2708,8 +2797,8 @@ msgstr "Ja"
 msgid "Delete this account"
 msgstr "Dieses Konto löschen"
 
-#: ../user/delete_account.php:80 ../user/delete_profile.php:53
-#: ../user/friend.php:239 ../user/user_search.php:58
+#: ../user/delete_account.php:80 ../user/delete_profile.php:55
+#: ../user/friend.php:241 ../user/user_search.php:58
 #: ../user/user_search.php:63
 msgid "No"
 msgstr "Nein"
@@ -2718,44 +2807,44 @@ msgstr "Nein"
 msgid "Do not delete this account"
 msgstr "Dieses Konto NICHT löschen"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
 msgstr "Konnte Profil nicht löschen - Bitte versuchen Sie es später noch einmal"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "Bestätigung der Löschung"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
 msgstr "Ihr Profil wurde gelöscht."
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
 msgstr "Bestätigung der Profillöschung"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: ../user/delete_profile.php:44
+#: ../user/delete_profile.php:46
 msgid ""
 "Deleted profiles are gone forever and cannot be recovered --\n"
 "you will have to start from scratch\n"
 "if you want another profile in the future."
 msgstr "Gelöschte Profile sind für immer verloren und können nicht wiederhergestellt werden.\nSie müssen alle Daten neu eingeben,\nwenn Sie ein neues Profil möchten."
 
-#: ../user/delete_profile.php:48
+#: ../user/delete_profile.php:50
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
 msgstr "Wenn Sie absolut sicher sind Ihr Profil aus\nder Datenbank zu entfernen, dann klicken Sie 'Ja'."
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
 msgstr "Mein Profil löschen"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
 msgstr "Mein Profil soll nicht gelöscht werden"
 
@@ -2936,241 +3025,201 @@ msgstr "Diese Aktion wird alle Änderungen die Sie in Ihren Community-Einstellun
 msgid "Reset preferences"
 msgstr "Einstellungen zurücksetzen"
 
-#: ../user/edit_forum_preferences_action.php:88
+#: ../user/edit_forum_preferences_action.php:95
 msgid "Error: Not the right kind of file, only PNG and JPEG are supported."
 msgstr "Fehler: Nicht der richtige Dateityp, nur Formate PNG und JPEG sind unterstützt."
 
-#: ../user/edit_forum_preferences_action.php:114
+#: ../user/edit_forum_preferences_action.php:120
 msgid "Your signature was too long, please keep it less than 250 characters."
 msgstr "Ihre Signatur war zu lang, bitte bleiben Sie unter 250 Zeichen."
 
-#: ../user/edit_forum_preferences_action.php:132
-#: ../user/edit_forum_preferences_action.php:146
+#: ../user/edit_forum_preferences_action.php:139
+#: ../user/edit_forum_preferences_action.php:153
 msgid "No such user: %1"
 msgstr "Kein solcher Benutzer: %1"
 
-#: ../user/edit_forum_preferences_form.php:56
+#: ../user/edit_forum_preferences_form.php:45
 msgid ""
 "How should we notify you of new private messages, friend requests, posts in "
 "subscribed threads, and other events?"
 msgstr "Wie sollen wir Sie bei neuen privaten Nachrichten, Freundschaftsanfragen, Antworten in abonnierten Foren und bei anderen Ereignissen benachrichtigen?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
 msgstr "Auf der Seite meines Kontos (keine E-Mail)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
 msgstr "Unverzüglich, per E-Mail"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
 msgstr "In einer täglichen E-Mail-Zusammenfassung"
 
-#: ../user/edit_forum_preferences_form.php:75
+#: ../user/edit_forum_preferences_form.php:65
 msgid "Message-board identity"
 msgstr "Identität in Diskussionsforen"
 
-#: ../user/edit_forum_preferences_form.php:76
+#: ../user/edit_forum_preferences_form.php:66
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../user/edit_forum_preferences_form.php:77
+#: ../user/edit_forum_preferences_form.php:67
 msgid "An image representing you on the message boards."
 msgstr "Ein Bild welches in den Diskussionsforen angezeigt wird."
 
-#: ../user/edit_forum_preferences_form.php:78
+#: ../user/edit_forum_preferences_form.php:68
 msgid "Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels"
 msgstr "Format: JPEG oder PNG. Größe: max. 4KB, 100x100 pixel"
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
 msgstr "Keinen Avatar benutzen"
 
-#: ../user/edit_forum_preferences_form.php:82
+#: ../user/edit_forum_preferences_form.php:72
 msgid "Use a Globally Recognized Avatar provided by %1"
 msgstr "Benutze einen allgemein anerkannten und bereitgestellten Avatar von %1"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
 msgstr "Benutze diesen hochgeladenen Avatar:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
 msgstr "Avatar Vorschau"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
 msgstr "So wird Ihr Avatar aussehen"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
 msgstr "Signatur für Nachrichten in den Diskussionsforen"
 
-#: ../user/edit_forum_preferences_form.php:99
+#: ../user/edit_forum_preferences_form.php:89
 msgid ""
 "Check out %1various free services%2\n"
 "<br> providing dynamic 'signature images'\n"
 "<br> showing your latest credit info, project news, etc."
 msgstr "Weitere %1 verschiedene freie Dienste%2 zur\n<br> Bereitstellung dynamischer 'Signaturbilder',\n<br> Anzeigen Ihrer aktuellen Punkte, Projektneuigkeiten, etc."
 
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr "verbleibende Zeichen"
-
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
 msgstr "Standardmäßig Signatur anhängen"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
 msgstr "Vorschau Signatur"
 
-#: ../user/edit_forum_preferences_form.php:109
+#: ../user/edit_forum_preferences_form.php:97
 msgid "This is how your signature will look in the forums"
 msgstr "So wird Ihre Signatur in den Diskussionsforen aussehen"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "Nachrichtenanzeige"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
 msgstr "Was soll angezeigt werden?"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
 msgstr "alle Avatarbilder ausblenden"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
 msgstr "alle Signaturen ausblenden"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
 msgstr "Bilder als Links anzeigen"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
 msgstr "Öffne Links in einem neuen Fenster/Tab"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
 msgstr "Besondere Benutzer hervorheben"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
 msgstr "Diese Anzahl Nachrichten pro Seite anzeigen."
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
 msgstr "sortieren nach"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "Themen:"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "Beiträge:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
 msgstr "Automatisch zum ersten neuen Beitrag im Thema springen"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
 msgstr "Angepinnte Beiträge nicht nach oben bewegen"
 
-#: ../user/edit_forum_preferences_form.php:148
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
 msgstr "Nachrichtenfilter"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
 msgstr "Gefilterte Benutzer"
 
-#: ../user/edit_forum_preferences_form.php:165
+#: ../user/edit_forum_preferences_form.php:154
 msgid "Ignore message board posts and private messages from these users."
 msgstr "Ignoriere Beiträge in Diskussionsforen und Private Nachrichten von diesen Benutzern."
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
 msgstr "Benutzer ID (zum Beispiel: 123456789)"
 
-#: ../user/edit_forum_preferences_form.php:168 ../user/pm.php:251
+#: ../user/edit_forum_preferences_form.php:157 ../user/pm.php:256
 msgid "Add user to filter"
 msgstr "Benutzer zum Filter hinzufügen"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
 msgstr "Hier klicken um die Einstellungen zu aktualisieren"
 
-#: ../user/edit_forum_preferences_form.php:175
-#: ../user/edit_forum_preferences_form.php:177
+#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:166
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../user/edit_forum_preferences_form.php:176
+#: ../user/edit_forum_preferences_form.php:165
 msgid "Or click here to reset preferences to the defaults"
 msgstr "Oder hier klicken um auf die Standardvorgaben zurückzusetzen"
 
 #: ../user/edit_passwd_action.php:50
-msgid "Invalid account key"
-msgstr "ungültiger Kontoschlüssel"
-
-#: ../user/edit_passwd_action.php:55
-msgid "No account with that email address was found"
-msgstr "Kein Konto mit dieser E-Mail-Adresse wurde gefunden"
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "Ungültiges Passwort"
-
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
-msgid "Change password"
-msgstr "Passwort ändern"
-
-#: ../user/edit_passwd_action.php:67
-msgid "Your password has been changed."
-msgstr "Ihr Passwort wurde geändert"
-
-#: ../user/edit_passwd_action.php:69
 msgid ""
 "We can't update your password due to a database problem. Please try again "
 "later."
 msgstr "Wir konnten Ihr Passwort wegen eines Datenbankproblems nicht ändern. Bitte versuchen Sie es später noch einmal."
 
-#: ../user/edit_passwd_form.php:39
-msgid "You can identify yourself using either"
-msgstr "Sie können sich identifizieren, entweder mit Hilfe von"
-
-#: ../user/edit_passwd_form.php:41
-msgid "your email address and old password"
-msgstr "Ihrer E-Mail-Adresse und dem alten Passwort"
-
-#: ../user/edit_passwd_form.php:42
-msgid "your account key"
-msgstr "Ihrem Kontoschlüssel"
-
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr "Aktuelles Passwort"
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr "<b>ODER</b>: Kontoschlüssel"
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
+msgid "Change password"
+msgstr "Passwort ändern"
 
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr "Kontoschlüssel per E-Mail bekommen"
+#: ../user/edit_passwd_action.php:54
+msgid "Your password has been changed."
+msgstr "Ihr Passwort wurde geändert"
 
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
 msgstr "Neues Passwort bestätigen"
 
@@ -3381,19 +3430,19 @@ msgstr "Benutzen Sie den Zurückschalter Ihres Browsers um auf das Nachrichtenfo
 msgid "Sending emails"
 msgstr "E-Mails senden"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr "E-Mail erfolgreich an %1 gesendet"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr "Fehler beim versenden der E-Mail an %1: %2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr "Danke dass Sie ihren Freunden über %1 berichtet haben"
 
-#: ../user/ffmail_action.php:94
+#: ../user/ffmail_action.php:92
 msgid ""
 "You forgot to enter your friends' names and/or email addresses; Please "
 "%1return to the form%2 and enter them."
@@ -3444,79 +3493,73 @@ msgstr "Zusätzliche Nachricht (optional)"
 msgid "Send"
 msgstr "Senden"
 
-#: ../user/forum_banishment_vote.php:35
-#: ../user/forum_banishment_vote_action.php:33
+#: ../user/forum_banishment_vote.php:37
+#: ../user/forum_banishment_vote_action.php:35
 msgid "You are not authorized to banish users."
 msgstr "Sie sind nicht befugt Benutzer zu verbannen."
 
-#: ../user/forum_banishment_vote.php:41 ../user/forum_banishment_vote.php:46
+#: ../user/forum_banishment_vote.php:43 ../user/forum_banishment_vote.php:48
 msgid "Banishment Vote"
 msgstr "Abstimmung über Verbannung"
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
 msgstr "Kein Benutzer mit dieser ID gefunden."
 
-#: ../user/forum_banishment_vote.php:54 ../user/forum_moderate_post.php:76
+#: ../user/forum_banishment_vote.php:57 ../user/forum_moderate_post.php:79
 msgid "User is already banished"
 msgstr "Benutzer ist bereits gebannt"
 
-#: ../user/forum_banishment_vote.php:59 ../user/forum_moderate_post.php:79
+#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_post.php:82
 msgid ""
 "Are you sure you want to banish %1?<br/>This will prevent %1 from posting "
 "for chosen time period.<br/>It should be done only if %1 has consistently "
 "exhibited trollish behavior."
 msgstr "Sind Sie sicher dass Sie %1 verbannen wollen?<br/>Das wird verhindern dass %1 für eine ausgewählte Zeit etwas schreiben kann.<br/>Das sollte nur geschehen wenn %1 dauerhaft schlechtes Verhalten gezeigt hat."
 
-#: ../user/forum_banishment_vote.php:61
+#: ../user/forum_banishment_vote.php:64
 msgid ""
 "Select the reason category, optionally write a longer description of why the"
 " user should be banished."
 msgstr "Wählen Sie den Grund aus der Kategorie, optional schreiben Sie eine längere Erklärung warum der Benutzer gebannt werden sollte."
 
-#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
+#: ../user/forum_banishment_vote.php:65 ../user/forum_moderate_thread.php:56
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../user/forum_banishment_vote.php:64
-#: ../user/forum_banishment_vote_action.php:57
-#: ../user/forum_moderate_post.php:55 ../user/forum_moderate_thread.php:52
+#: ../user/forum_banishment_vote.php:67
+#: ../user/forum_banishment_vote_action.php:59
+#: ../user/forum_moderate_post.php:58 ../user/forum_moderate_thread.php:58
 msgid "Obscene"
 msgstr "Obszön"
 
-#: ../user/forum_banishment_vote.php:65
-#: ../user/forum_banishment_vote_action.php:59
-#: ../user/forum_moderate_post.php:56 ../user/forum_moderate_thread.php:53
+#: ../user/forum_banishment_vote.php:68
+#: ../user/forum_banishment_vote_action.php:61
+#: ../user/forum_moderate_post.php:59 ../user/forum_moderate_thread.php:59
 msgid "Flame/Hate mail"
 msgstr "Beleidigende/Hass Mail"
 
-#: ../user/forum_banishment_vote.php:66
-#: ../user/forum_banishment_vote_action.php:61
-#: ../user/forum_moderate_post.php:59
+#: ../user/forum_banishment_vote.php:69
+#: ../user/forum_banishment_vote_action.php:63
+#: ../user/forum_moderate_post.php:62
 msgid "User Request"
 msgstr "Benutzeranfrage"
 
-#: ../user/forum_banishment_vote.php:67
-#: ../user/forum_banishment_vote_action.php:63
-#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:55
-msgid "Other"
-msgstr "Anderer"
-
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_post.php:53
-#: ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_post.php:56
+#: ../user/forum_moderate_thread.php:100
 msgid "Reason"
 msgstr "Grund"
 
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_thread.php:100
 msgid "Mailed if nonempty"
 msgstr "wird verschickt wenn nicht leer"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "Mit Abstimmung fortfahren"
 
-#: ../user/forum_banishment_vote_action.php:39
-#: ../user/forum_moderate_post_action.php:63
+#: ../user/forum_banishment_vote_action.php:41
+#: ../user/forum_moderate_post_action.php:66
 msgid "You must specify an action..."
 msgstr "Sie müssen eine Aktion bestimmen...."
 
@@ -3530,7 +3573,7 @@ msgstr "Sie können diesen Beitrag nicht länger bearbeiten.<br/>Beiträge könn
 msgid "You are not authorized to edit this post."
 msgstr "Sie sind nicht befugt diesen Beitrag zu bearbeiten."
 
-#: ../user/forum_edit.php:86 ../user/forum_search.php:72
+#: ../user/forum_edit.php:86 ../user/forum_search.php:74
 msgid "Forum"
 msgstr "Forum"
 
@@ -3539,828 +3582,828 @@ msgid "Edit your message"
 msgstr "Ihre Nachricht bearbeiten"
 
 #: ../user/forum_edit.php:115 ../user/forum_edit.php:120
-#: ../user/forum_post.php:109 ../user/forum_post.php:111
-#: ../user/team_forum.php:69
+#: ../user/forum_post.php:113 ../user/forum_post.php:115
+#: ../user/team_forum.php:71
 msgid "Title"
 msgstr "Titel"
 
-#: ../user/forum_edit.php:144 ../user/forum_post.php:129
+#: ../user/forum_edit.php:144 ../user/forum_post.php:133
 msgid "Add my signature to this post"
 msgstr "Diesem Beitrag meine Signatur anfügen"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
 msgstr "Für Sie nicht sichtbar"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "Team-Diskussionsforum für %1 "
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "Neues Thema"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
 msgstr "Ein neues Thema in diesem Forum erstellen"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
 msgstr "Dieses Diskussionsforum ist auch als %1RSS feed%2 verfügbar"
 
-#: ../user/forum_forum.php:174
+#: ../user/forum_forum.php:178
 msgid "This thread is hidden"
 msgstr "Dieses Thema ist versteckt"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "This thread is sticky and locked, and you haven't read it yet"
 msgstr "Dieses Thema ist angepinnt und gesperrt und Sie haben es noch nicht gelesen"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
 msgstr "angepinnt/gesperrt/ungelesen"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
 msgstr "Dieses Thema ist angepinnt und Sie haben es noch nicht gelesen"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "sticky/unread"
 msgstr "angepinnt/ungelesen"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "You haven't read this thread yet, and it's locked"
 msgstr "Sie haben dieses Thema noch nicht gelesen und es ist gesperrt"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
 msgstr "ungelesen/gesperrt"
 
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
 msgstr "Sie haben dieses Thema noch nicht gelesen"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "This thread is sticky and locked"
 msgstr "Dieses Thema ist angepinnt und gesperrt"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "sticky/locked"
 msgstr "angepinnt/gesperrt"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "This thread is sticky"
 msgstr "Dieses Thema ist angepinnt"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "sticky"
 msgstr "angepinnt"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "This thread is locked"
 msgstr "Dieses Thema ist gesperrt"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
 msgstr "gesperrt"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "You read this thread"
 msgstr "Sie haben dieses Thema gelesen"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "read"
 msgstr "gelesen"
 
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "Fragen und Antworten"
 
-#: ../user/forum_help_desk.php:30
+#: ../user/forum_help_desk.php:32
 msgid ""
 "Talk live via Skype with a volunteer, in any of several languages. Go to "
 "%1BOINC Online Help%2."
 msgstr "Sprechen Sie live mit einem Helfer in einer der vielen Sprachen über Skype. Gehen Sie zur %1BOINC Online Hilfe%2."
 
-#: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
+#: ../user/forum_help_desk.php:46 ../user/forum_index.php:97
 msgid "Topic"
 msgstr "Themengebiet"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "Fragen"
 
-#: ../user/forum_index.php:53 ../user/team_forum.php:68
+#: ../user/forum_index.php:58 ../user/team_forum.php:70
 msgid "Discussion among members of %1"
 msgstr "Diskussionen der Mitglieder von %1"
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "%1 Diskussionsforen"
 
-#: ../user/forum_index.php:78
+#: ../user/forum_index.php:83
 msgid ""
 "If you have a question or problem, please use the %1Questions & Answers%2 "
 "section of the message boards."
 msgstr "Wenn Sie eine Frage oder ein Problem haben, benutzen Sie bitte die %1Fragen & Antworten%2 Rubrik der Diskussionsforen."
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
 msgstr "Abonnierte Themen"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "Beitrag moderieren"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
 msgstr "Beitrag verstecken"
 
-#: ../user/forum_moderate_post.php:57 ../user/forum_moderate_thread.php:54
+#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:60
 msgid "Commercial spam"
 msgstr "Kommerzieller Spam/Werbung"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
 msgstr "doppelter Beitrag"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "Verschiebe Beitrag"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
 msgstr "ID des Zielthemas:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
 msgstr "Benutzer verbannen"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
 msgstr "Dauer der Verbannung"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4 Stunden"
 
-#: ../user/forum_moderate_post.php:82 ../user/forum_search.php:45
+#: ../user/forum_moderate_post.php:85 ../user/forum_search.php:47
 msgid "1 day"
 msgstr "1 Tag"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
 msgstr "1 Woche"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2 Wochen"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
 msgstr "1 Monat"
 
-#: ../user/forum_moderate_post.php:86
+#: ../user/forum_moderate_post.php:89
 msgid "Forever"
 msgstr "Für immer"
 
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr "Zusätzliche Erklärung %1 Diese ist in der E-Mail an Benutzer enthalten.%2"
-
-#: ../user/forum_moderate_post.php:101 ../user/forum_moderate_thread.php:91
-#: ../user/forum_post.php:130 ../user/forum_report_post.php:85
-#: ../user/forum_rss.php:55 ../user/friend.php:81 ../user/get_passwd.php:41
-#: ../user/get_passwd.php:75
+#: ../user/forum_moderate_post.php:99 ../user/forum_moderate_post.php:112
+#: ../user/forum_moderate_thread.php:106 ../user/forum_post.php:134
+#: ../user/forum_report_post.php:88 ../user/forum_rss.php:51
+#: ../user/friend.php:83 ../user/get_passwd.php:32 ../user/get_passwd.php:75
 msgid "OK"
 msgstr "OK"
 
-#: ../user/forum_moderate_post_action.php:57
+#: ../user/forum_moderate_post.php:107
+msgid "Optional explanation %1 This is included in email to user.%2"
+msgstr "Zusätzliche Erklärung %1 Diese ist in der E-Mail an Benutzer enthalten.%2"
+
+#: ../user/forum_moderate_post_action.php:60
 msgid "You are not authorized to moderate this post."
 msgstr "Sie sind nicht befugt diesen Beitrag zu moderieren."
 
-#: ../user/forum_moderate_post_action.php:85
+#: ../user/forum_moderate_post_action.php:105
 msgid "Can't move to different category type"
 msgstr "Kann nicht zu einem anderen Kategorietyp verschoben werden"
 
-#: ../user/forum_moderate_post_action.php:89
+#: ../user/forum_moderate_post_action.php:109
 msgid "Can't move to different category"
 msgstr "Kann nicht zu einer anderen Kategorie verschoben werden."
 
-#: ../user/forum_moderate_post_action.php:110
+#: ../user/forum_moderate_post_action.php:130
 msgid "Not authorized to banish users"
 msgstr "Nicht befugt um Benutzer zu verbannen"
 
-#: ../user/forum_moderate_post_action.php:126
+#: ../user/forum_moderate_post_action.php:146
 msgid "Banishment"
 msgstr "Verbannung"
 
-#: ../user/forum_moderate_post_action.php:128
+#: ../user/forum_moderate_post_action.php:148
 msgid "User %1 has been banished."
 msgstr "Benutzer %1 wurde verbannt."
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
 msgstr "Aktion fehlgeschlagen: mögliches Datenbankproblem"
 
-#: ../user/forum_moderate_thread.php:33
+#: ../user/forum_moderate_thread.php:38
 msgid "not authorized"
 msgstr "nicht befugt"
 
-#: ../user/forum_moderate_thread.php:36
+#: ../user/forum_moderate_thread.php:41
 msgid "Moderate thread '%1'"
 msgstr "Moderiere Thema '%1'"
 
-#: ../user/forum_moderate_thread.php:48
+#: ../user/forum_moderate_thread.php:54
 msgid ""
 "Select the reason category, or write a longer description of why you're "
 "hiding or locking the thread; then press OK."
 msgstr "Den Grund in der Kategorie auswählen, oder eine längere Beschreibung eingeben warum Sie das Thema sperren oder verstecken wollen; dann OK drücken."
 
-#: ../user/forum_moderate_thread.php:72
+#: ../user/forum_moderate_thread.php:78
 msgid "Current forum"
 msgstr "Aktuelles Forum"
 
-#: ../user/forum_moderate_thread.php:73
+#: ../user/forum_moderate_thread.php:79
 msgid "Destination forum"
 msgstr "Zielforum"
 
-#: ../user/forum_moderate_thread.php:77
+#: ../user/forum_moderate_thread.php:83
 msgid "New title:"
 msgstr "Neuer Titel:"
 
-#: ../user/forum_post.php:40
+#: ../user/forum_post.php:44
 msgid ""
 "Only project admins may create a thread here. However, you may reply to "
 "existing threads."
 msgstr "Nur Projektadministratoren können hier ein Thema erstellen. Wie dem auch sei, Sie können vielleicht in bereits existierenden Themen antworten."
 
-#: ../user/forum_post.php:60
+#: ../user/forum_post.php:64
 msgid ""
 "Your message was flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "Ihr verwendeter Text wurde beim ersten Versuch vom Akismet Anti-Spam-System als Spam erkannt. Bitte verändern Sie Ihren Text und versuchen Sie es erneut."
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
 msgstr "Neues Thema erstellen"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
 msgstr "Ein neues Thema erstellen"
 
-#: ../user/forum_post.php:105
+#: ../user/forum_post.php:109
 msgid "Remember to add a title"
 msgstr "Denken Sie daran einen Titel anzugeben"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Show this item as a Notice in the BOINC Manager"
 msgstr "Dieses Element als eine Nachricht im BOINC Manager anzeigen"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Do so only for items likely to be of interest to all volunteers."
 msgstr "Machen Sie das nur für Elemente die von Interesse für die Benutzer sein könnten."
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
 msgstr "Bewertung abgeschaltet"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
 msgstr "Diese Funktion ist zur Zeit vom Projekt abgeschaltet."
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
 msgstr "Sie brauchen eine höhere durchschnittliche Punktzahl oder Gesamtpunktzahl um einen Beitrag zu bewerten."
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
 msgstr "Sie haben diesen Beitrag bereits bewertet."
 
-#: ../user/forum_rate.php:62 ../user/forum_rate.php:78
-#: ../user/forum_rate.php:83 ../user/forum_report_post.php:69
-#: ../user/forum_report_post.php:94 ../user/forum_subscribe.php:54
-#: ../user/forum_subscribe.php:69 ../user/forum_thread_status.php:51
+#: ../user/forum_rate.php:64 ../user/forum_rate.php:80
+#: ../user/forum_rate.php:85 ../user/forum_report_post.php:72
+#: ../user/forum_report_post.php:97 ../user/forum_subscribe.php:56
+#: ../user/forum_subscribe.php:71 ../user/forum_thread_status.php:56
 msgid "Return to thread"
 msgstr "Zurück zum Thema"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
 msgstr "Eingabe gespeichert"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
 msgstr "Ihre Eingabe wurden gespeichert. Danke für Ihre Hilfe."
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
 msgstr "Stimme registriert"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
 msgstr "Ihre Bewertung wurde gespeichert. Danke für Ihre Eingabe."
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
 msgstr "Problem bei der Abstimmung (Übermittlungsfehler)"
 
-#: ../user/forum_reply.php:73
+#: ../user/forum_reply.php:76
 msgid ""
 "Your post has been flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "Ihr verwendeter Text wurde beim ersten Versuch von dem Akismet Anti-Spam-System als Spam erkannt. Bitte verändern Sie Ihren Text und versuchen Sie es erneut."
 
-#: ../user/forum_reply.php:88 ../user/forum_thread.php:158
-#: ../user/forum_thread.php:274
+#: ../user/forum_reply.php:91 ../user/forum_thread.php:159
+#: ../user/forum_thread.php:284
 msgid "Post to thread"
 msgstr "Zum Thema antworten"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
 msgstr "Antworte zur %1Nachricht ID%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
 msgstr "Antwort schreiben"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
 msgstr "Füge dieser Antwort meine Signatur hinzu"
 
-#: ../user/forum_report_post.php:45
+#: ../user/forum_report_post.php:48
 msgid "You need more average or total credit to report a post."
 msgstr "Sie brauchen eine höhere durchschnittliche Punktzahl oder Gesamtpunktzahl um einen Beitrag zu melden."
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "Bericht registriert"
 
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "Ihre Meldung wurde gespeichert. Danke für ihren Beitrag."
 
-#: ../user/forum_report_post.php:67
+#: ../user/forum_report_post.php:70
 msgid ""
 "A moderator will now look at your report and decide what will happen - this "
 "may take a little while, so please be patient"
 msgstr "Ein Moderator wird jetzt Ihre Meldung anschauen und entscheiden was passieren wird - dies kann eine Zeit lang dauern, gedulden Sie sich bitte"
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "Forenbeitrag melden"
 
-#: ../user/forum_report_post.php:73
+#: ../user/forum_report_post.php:76
 msgid ""
 "Before reporting this post, consider using the +/- rating system instead. If"
 " enough users rate a post negatively it will eventually be hidden.<br />You "
 "can find the rating system at the bottom of the post."
 msgstr "Bevor sie diesen Beitrag melden, überlegen Sie sich vielleicht stattdessen das Bewertungssystem (+/-) zu benutzen. Wenn genug Benutzer einen Beitrag negativ bewerten wird er evtl. versteckt werden.<br />Sie können das Bewertungssystem am Ende des Beitrags finden."
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "Beitrag melden"
 
-#: ../user/forum_report_post.php:81
+#: ../user/forum_report_post.php:84
 msgid ""
 "Why do you find the post offensive: %1Please include enough information so that a person that\n"
 "has not yet read the thread will quickly be able to identify the issue.%2"
 msgstr "Warum finden Sie diesen Beitrag unverschämt/angreifend: %1Bitte genug Information einfügen damit eine andere Person\ndie das Thema noch nicht gelesen hat schnell das Problem erkennen kann.%2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
 msgstr "Meldung nicht registriert"
 
-#: ../user/forum_report_post.php:91
+#: ../user/forum_report_post.php:94
 msgid "Your report could not be recorded. Please wait a while and try again."
 msgstr "Ihre Meldung konnte nicht aufgezeichnet werden. Bitte warten Sie eine Weile und versuchen Sie es erneut."
 
-#: ../user/forum_report_post.php:92
+#: ../user/forum_report_post.php:95
 msgid ""
 "If this is not a temporary error, please report it to the project "
 "developers."
 msgstr "Wenn das kein temporärer Fehler ist, dann melden Sie das bitte den Projektentwicklern."
 
-#: ../user/forum_rss.php:41
+#: ../user/forum_rss.php:38
 msgid "%1 RSS feed"
 msgstr "%1 RSS feed"
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
 msgstr "Dieses Diskussionsforum ist auch als RSS-Feed verfügbar."
 
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
 msgstr "Optionen:"
 
-#: ../user/forum_rss.php:47
+#: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
 msgstr "Beinhaltet nur Beiträge von Benutzer-ID %1 (Standard: alle Benutzer)"
 
-#: ../user/forum_rss.php:49
+#: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
 msgstr "Beinhaltet nur Beiträge der letzten %1 Tage (Standard: 30)."
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr "Beiträge kürzen: %1 (Beinhaltet nur die ersten 265 Zeichen von jedem Beitrag)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
 msgstr "Nur Themen: %1 (Beinhaltet nur die ersten Beiträge eines jeden Themas)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
 msgstr "Forum durchsuchen"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "Suchanfrage"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "Suche nach Schlüsselwörtern:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
 msgstr "Beiträge die die angegebenen Wörter enthalten werden angezeigt"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
 msgstr "Zum Beispiel: \"Bildschirmschoner eingefroren\""
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "Suche nach Autor ID:"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
 msgstr "Nur Beiträge dieses Benutzers werden angezeigt"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
 msgstr "Zum Beispiel: \"43214\""
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "Suchoptionen"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "Einschränkungen der Suche"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
 msgstr "Suche maximal diese Anzahl von Tagen in der Vergangenheit."
 
-#: ../user/forum_search.php:50 ../user/forum_search.php:51
+#: ../user/forum_search.php:52 ../user/forum_search.php:53
 msgid "%1 months"
 msgstr "%1 Monate"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
 msgstr "1 Jahr"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "keine Einschränkung"
+
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
 msgstr "Nur Beiträge aus diesem Forum anzeigen"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
 msgstr "Sortieren nach"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
 msgstr "Suche starten"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
 msgstr "Ergebnisse der Forensuche"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
 msgstr "Thementitel die Ihrer Anfrage entsprechen:"
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
 msgstr "Nachrichten die Ihrer Anfrage entsprechen:"
 
-#: ../user/forum_search_action.php:217
+#: ../user/forum_search_action.php:219
 msgid ""
 "Sorry, couldn't find anything matching your search query. You can try to "
 "broaden your search by using less words (or less specific words)."
 msgstr "Entschuldigung, Es konnte nichts gefunden werden was Ihrer Suchanfrage entspricht. Sie können versuchen Ihre Suche unter Verwendung von weniger Wörtern zu erweitern (oder weniger spezielle Wörter verwenden)."
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
 msgstr "Sie können ebenfalls %1die gleiche Suche auf Google probieren.%2 "
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
 msgstr "Andere Suche ausführen"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
 msgstr "Abonnement erfolgreich"
 
-#: ../user/forum_subscribe.php:49
+#: ../user/forum_subscribe.php:51
 msgid ""
 "You are now subscribed to %1. You will be notified whenever there is a new "
 "post."
 msgstr "Sie sind nun Abonnent von %1. Sie werden benachrichtigt sobald ein neuer Beitrag existiert."
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
 msgstr "Abonnement fehlgeschlagen"
 
-#: ../user/forum_subscribe.php:52
+#: ../user/forum_subscribe.php:54
 msgid ""
 "We are currently unable to subscribe you to %1. Please try again later.."
 msgstr "Wir sind momentan nicht in der Lage Sie %1 abonnieren zu lassen. Bitte versuchen Sie es später noch einmal."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
 msgstr "Abmeldung vom Abonnement erfolgreich"
 
-#: ../user/forum_subscribe.php:64
+#: ../user/forum_subscribe.php:66
 msgid ""
 "You are no longer subscribed to %1. You will no longer receive notifications"
 " for this thread."
 msgstr "Sie abonnieren nicht länger %1. Sie werden keine Mitteilungen mehr für dieses Thema erhalten."
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
 msgstr "Abmeldung (Abonnement) fehlgeschlagen"
 
-#: ../user/forum_subscribe.php:67
+#: ../user/forum_subscribe.php:69
 msgid ""
 "We are currently unable to unsubscribe you from %1. Please try again later.."
 msgstr "Wir sind momentan nicht in der Lage Sie von dem Abonnement %1 abzumelden. Bitte versuchen Sie es später noch einmal."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
 msgstr "Unbekannte Abonnement Aktion"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
 msgstr "Dieses Forum ist für Sie nicht sichtbar."
 
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
 msgstr "Dieses Thema wurde von Moderatoren versteckt."
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
 msgstr "Meine Frage wurde beantwortet"
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
 msgstr "Klicken Sie hier falls Ihre Frage hinlänglich beantwortet wurde."
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
 msgstr "Ich habe auch diese Frage"
 
-#: ../user/forum_thread.php:159 ../user/forum_thread.php:275
+#: ../user/forum_thread.php:160 ../user/forum_thread.php:285
 msgid "Add a new message to this thread"
 msgstr "Eine neue Nachricht zu diesem Thema schreiben"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "Nicht mehr abonnieren"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
 msgstr "Sie haben dieses Thema abonniert. Hier klicken zum abbestellen."
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
 msgstr "Anklicken um benachrichtigt zu werden, wenn neue Beiträge geschrieben wurden."
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
 msgstr "Dieses Thema sichtbar machen"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
 msgstr "Dieses Thema vor der Öffentlichkeit verstecken"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
 msgstr "Entpinnen"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
 msgstr "Dieses Thema nicht anpinnen"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
 msgstr "Anpinnen"
 
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr "Dieses Thema anpinnen"
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "Diesen Strang immer am Anfang dieses Forums anzeigen "
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
 msgstr "Entsperren"
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr "Dieses Thema entsperren"
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "Neue Beiträge in diesem Thema erlauben"
 
-#: ../user/forum_thread.php:221
+#: ../user/forum_thread.php:222
 msgid "Lock"
 msgstr "Sperren"
 
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
-msgstr "Dieses Thema sperren"
+#: ../user/forum_thread.php:223
+msgid "Don't allow new posts in this thread"
+msgstr "Keine neuen Beiträge in diesem Thema erlauben"
 
-#: ../user/forum_thread.php:229
+#: ../user/forum_thread.php:230
 msgid "Move this thread to a different forum"
 msgstr "Dieses Thema in ein anderes Forum verschieben"
 
-#: ../user/forum_thread.php:234
+#: ../user/forum_thread.php:235
 msgid "Edit title"
 msgstr "Titel bearbeiten"
 
-#: ../user/forum_thread.php:235
+#: ../user/forum_thread.php:236
 msgid "Edit thread title"
 msgstr "Den Titel des Themas bearbeiten"
 
-#: ../user/forum_thread.php:245
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "Thema endgültig löschen"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
 msgstr "Als Client-Nachricht exportieren"
 
-#: ../user/forum_thread.php:251
+#: ../user/forum_thread.php:260
 msgid "Don't export"
 msgstr "Nicht exportieren"
 
-#: ../user/forum_thread.php:252
+#: ../user/forum_thread.php:261
 msgid "Don't export this news item as a Notice"
 msgstr "Diesen Beitrag nicht als Client-Nachricht exportieren"
 
-#: ../user/forum_thread.php:260 ../user/forum_thread.php:262
+#: ../user/forum_thread.php:270 ../user/forum_thread.php:272
 msgid "Sort"
 msgstr "Sortieren"
 
-#: ../user/forum_thread_status.php:49
+#: ../user/forum_thread_status.php:54
 msgid "Thread status updated"
 msgstr "Themenstatus aktualisiert"
 
-#: ../user/forum_thread_status.php:50
+#: ../user/forum_thread_status.php:55
 msgid "The status has been updated."
 msgstr "Der Status wurde aktualisiert."
 
-#: ../user/forum_user_posts.php:73
+#: ../user/forum_user_posts.php:75
 msgid "Posts by %1"
 msgstr "Beiträge von %1"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
 msgstr "Ihr seit bereits Freunde"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
 msgstr "Sie haben die Freundschaft mit %1 am %2 angefragt."
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
 msgstr "Es wird noch auf eine Antwort gewartet."
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
 msgstr "%1 hat einer Freundschaft mit Ihnen nicht zugestimmt"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
 msgstr "Sie können nicht mit sich selbst Freundschaft schließen."
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
 msgstr "als Freund hinzufügen"
 
-#: ../user/friend.php:74
+#: ../user/friend.php:76
 msgid ""
 "You have asked to add %1 as a friend. We will notify %1 and will ask him/her"
 " to confirm that you are friends."
 msgstr "Sie möchten mit %1 Freundschaft schließen. Wir werden %2 benachrichtigen und Ihn/Sie bitten die Freundschaft zu bestätigen."
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
 msgstr "Eine Nachricht mitsenden (optional):"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
 msgstr "Freundschaftsanfrage gesendet"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
 msgstr "Wir haben %1 über die Anfrage benachrichtigt."
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr "Bitte melden Sie sich als %1 an"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr "Sie müssen sich als %1 anmelden um die Freundschaftsanfrage zu sehen"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
 msgstr "Freundschaftsanfrage"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
 msgstr "%1 hat die Freundschaft mit Ihnen angefragt."
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr "%1 sagt: %2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
 msgstr "Freundschaft akzeptieren"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
 msgstr "Akzeptieren anklicken wenn %1 tatsächlich ein Freund ist"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
 msgstr "Ablehnen anklicken wenn %1 kein Freund ist"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
 msgstr "Freundschaft bestätigt"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
 msgstr "Ihre Freundschaft mit %1 wurde bestätigt."
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
 msgstr "Freundschaft abgelehnt"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
 msgstr "Sie haben die Freundschaft mit %1 abgelehnt."
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
 msgstr "Benachrichtigung nicht gefunden"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
 msgstr "Freundschaft bestätigt"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
 msgstr "Sie sind nun mit %1 befreundet."
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
 msgstr "Freundschaft aufheben"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
 msgstr "Bist Du sicher die Freundschaft mit %1 aufzuheben?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
 msgstr "Freunde bleiben"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
 msgstr "Freundschaft aufgehoben"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
 msgstr "Ihre Freundschaft mit %1 wurde aufgehoben."
 
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr "Kontoinformationen vergessen?"
-
-#: ../user/get_passwd.php:28
+#: ../user/get_passwd.php:27
 msgid ""
 "1) If you know your account's email address, and you can receive email "
 "there:"
 msgstr "1) Wenn Sie die E-Mail-Adresse des Kontos noch wissen und die E-Mails auch abrufen können:"
 
-#: ../user/get_passwd.php:29
+#: ../user/get_passwd.php:28
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
@@ -4409,17 +4452,26 @@ msgstr "Sie werden jetzt mit Ihrem Konto angemeldet, bitte aktualisieren Sie als
 
 #: ../user/get_passwd.php:71
 msgid "Log in with authenticator"
-msgstr "Einloggen mit Authentikator"
+msgstr "Einloggen mit Kontoschlüssel"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "Kontoinformationen vergessen?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
 msgstr "Es sind noch keine GPU Aufgaben zurückgemeldet."
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Beste Grafikkarten"
+
+#: ../user/gpu_list.php:207
 msgid ""
 "The following lists show the most productive GPU models on different "
-"platforms.  Relative speeds are shown in parentheses."
-msgstr "Die produktivsten Grafikkarten für die verschiedenen Plattformen zeigt diese Liste. Die relative Geschwindigkeit ist in Klammern angegeben."
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "Die produktivsten Grafikkarten für die verschiedenen Plattformen zeigt diese Liste. Die relative Geschwindigkeit, berechnet aus der durchschnittlichen Bearbeitungszeit, ist in Klammern angegeben."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4433,6 +4485,10 @@ msgstr "Die Kontoeinstellungen können Sie mit den folgenden Links anzeigen und
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "Laden Sie die %1BOINC-Clientsoftware%2 herunter, wenn Sie das nicht bereits getan haben."
 
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "Ihr Konto"
+
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
 msgstr "Anonyme Plattform, fehlende Anwendung"
@@ -4547,10 +4603,14 @@ msgstr "kein Computername"
 msgid "Merge hosts"
 msgstr "Computer zusammenführen"
 
-#: ../user/host_update_credit.php:28
+#: ../user/host_update_credit.php:27
 msgid "Updating computer credit"
 msgstr "Punkte der Computer werden aktualisiert"
 
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "Punkte des Computers aktualisiert"
+
 #: ../user/host_venue_action.php:41
 msgid "Host venue updated"
 msgstr "Ort des Computer aktualisiert"
@@ -4630,7 +4690,11 @@ msgstr "Bild, max. Höhe: 450 pixel. Bitte nicht auf Bilder, ohne das Einverstä
 
 #: ../user/html.php:35
 msgid "You can also use ampersand notation for special characters."
-msgstr "Sie können auch die Kaufmännisch-Und Notation für spezielle Zeichen benutzen."
+msgstr "Sie können auch die kaufmännisch-Und Notation für spezielle Zeichen benutzen."
+
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "Lesen Sie unsere Regeln und Grundsätze"
 
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
@@ -4658,7 +4722,7 @@ msgstr "Wenn Sie %1 auf Ihrem Computer arbeiten lassen, beansprucht es einen Tei
 msgid ""
 "The work done by your computer contributes to the goals of %1, as described "
 "on its web site. The application programs may change from time to time."
-msgstr "Die von Ihrem Computer durchgeführte Arbeit trägt dazu bei, die Ziele von %1 zu erreichen, wie sie auf der Webseite beschrieben sind. Die Anwendungsprogramme können sich von Zeit zu Zeit ändern."
+msgstr "Die von Ihrem Computer durchgeführte Arbeit trägt dazu bei, die Ziele von %1 zu erreichen, wie sie auf der Webseite beschrieben sind. Die Anwendungsprogramme können sich dabei von Zeit zu Zeit ändern."
 
 #: ../user/info.php:42
 msgid "Privacy policy"
@@ -4679,7 +4743,7 @@ msgid ""
 "decide what type of work to assign to your computer. This information will "
 "also be shown on %1's web site. Nothing that reveals your computer's "
 "location (e.g. its domain name or network address) will be shown."
-msgstr "Wenn Sie an %1 teilnehmen, werden Informationen über Ihren Computer  (darunter der Prozessortyp, die Speichergröße, usw.) aufgezeichnet und von %1 verwendet, um zu entscheiden, welche Art von Arbeit Ihrem Computer zugewiesen werden soll. Diese Informationen werden ebenfalls auf der Webseite von %1 gezeigt. Nichts, das Rückschlüsse auf den Standort Ihres Computers zulässt, (wie z. B. sein Domainnname oder seine Netzwerkadresse) wird angezeigt."
+msgstr "Wenn Sie an %1 teilnehmen, werden Informationen über Ihren Computer  (darunter der Prozessortyp, die Speichergröße, usw.) aufgezeichnet und von %1 verwendet, um zu entscheiden, welche Art von Aufgaben Ihrem Computer zugewiesen werden sollen. Diese Informationen werden ebenfalls auf der Webseite von %1 gezeigt. Es wird Nichts angezeigt, dass Rückschlüsse auf den Standort Ihres Computers zulässt (wie z. B. sein Domainnname oder seine Netzwerkadresse)."
 
 #: ../user/info.php:45
 msgid ""
@@ -4695,7 +4759,7 @@ msgid ""
 "If you receive unwanted private messages from another %1 user, you may add "
 "them to your %2message filter%3.  This will prevent you from seeing any "
 "public or private messages from that user."
-msgstr "Über die %1 Webseite versendete Private Nachrichten können nur vom Sender und Empfänger gelesen werden.  %1 unternimmt keine Überprüfung des Inhalts von privaten Nachrichten.  Wenn Sie ungewollt private Nachrichten von einem %1 Benutzer erhalten, können Sie diesen zu Ihrem %2Filter hinzufügen%3.  Damit sehen Sie keine öffentlichen und privaten Nachrichten dieses Benutzers mehr."
+msgstr "Über die %1 Webseite versendete private Nachrichten können nur vom Sender und Empfänger gelesen werden.  %1 unternimmt keine Überprüfung des Inhalts von privaten Nachrichten.  Wenn Sie ungewollt private Nachrichten von einem %1 anderen Nutzer erhalten, können Sie diesen zu Ihrem %2Filter hinzufügen%3.  Damit sehen Sie keine öffentlichen und privaten Nachrichten dieses Nutzers mehr."
 
 #: ../user/info.php:47
 msgid ""
@@ -4703,11 +4767,11 @@ msgid ""
 "Messages posted to the %1 forums are visible to everyone, including non-"
 "members.  By posting to the forums, you are granting irrevocable license for"
 " anyone to view and copy your posts."
-msgstr "Wenn Sie unsere Diskussionsforen benutzen wollen, müssen Sie die %2Regeln & Grundsätze%3 befolgen. Nachrichten in den %1 Diskussionsforen sind öffentlich sichtbar. Mit dem veröffentlichen stimmen Sie zu das jedermann Ihre Nachrichten ansehen und kopieren darf."
+msgstr "Wenn Sie unsere Diskussionsforen benutzen wollen, müssen Sie die %2Regeln & Grundsätze%3 befolgen. Nachrichten in den %1 Diskussionsforen sind öffentlich sichtbar. Mit dem Veröffentlichen stimmen Sie zu, dass Jedermann Ihre Nachrichten ansehen und kopieren darf."
 
 #: ../user/info.php:48
 msgid "Is it safe to run %1?"
-msgstr "Sicherheit"
+msgstr "Ist es sicher an %1 teilzunehmen?"
 
 #: ../user/info.php:49
 msgid ""
@@ -4718,7 +4782,7 @@ msgid ""
 "are configured for high security. To ensure the integrity of program "
 "downloads, all executable files are digitally signed on a secure computer "
 "not connected to the Internet."
-msgstr "Wann immer Sie ein Programm aus dem Internet herunterladen, riskieren Sie, dass das Programm gefährliche Fehler enthalten, oder der Download-Server gehackt worden sein könnte. Für %1 wurden große Anstrengungen unternommen, diese Risiken zu minimieren. Wir haben unsere Anwendungen einer sorgfältigen Prüfung unterzogen. Unsere Server werden durch eine Firewall und weitere Sicherheitsmechanismen geschützt. Um sicherzustellen, dass die vom Programm heruntergeladenen Dateien nicht man [...]
+msgstr "Wann immer Sie ein Programm aus dem Internet herunterladen, riskieren Sie, dass das Programm gefährliche Fehler enthält, oder der Download-Server gehackt worden sein könnte. %1 hat große Anstrengungen unternommen, diese Risiken zu minimieren. Wir haben unsere Anwendungen einer sorgfältigen Prüfung unterzogen. Unsere Server werden durch eine Firewall und weitere Sicherheitsmechanismen geschützt. Um sicherzustellen, dass die vom Programm heruntergeladenen Dateien nicht manipuliert  [...]
 
 #: ../user/info.php:50
 msgid ""
@@ -4751,7 +4815,7 @@ msgid ""
 "Other projects use the same platform, BOINC, as %1. You may want to consider"
 " participating in one or more of these projects. By doing so, your computer "
 "will do useful work even when %1 has no work available for it."
-msgstr "Es gibt andere Projekte, bei denen wie bei %1 die Softwareplattform BOINC zum Einsatz kommt. Möglicherweise ziehen Sie in Betracht, an einem oder mehreren dieser Projekte teilzunehmen. Dadurch wird Ihr Computer auch dann sinnvolle Arbeit verrichten, wenn von %1 gerade keine Arbeit verfügbar ist."
+msgstr "Es gibt andere Projekte, bei denen wie bei %1 die Softwareplattform BOINC zum Einsatz kommt. Möglicherweise ziehen Sie in Betracht, an einem oder mehreren dieser Projekte teilzunehmen. Dadurch wird Ihr Computer auch dann sinnvolle Arbeit verrichten, wenn von %1 gerade keine Arbeitspakete verfügbar sind."
 
 #: ../user/info.php:58
 msgid ""
@@ -4774,7 +4838,7 @@ msgstr "Diese Internetseite ist in mehreren Sprachen verfügbar. Die aktuelle Ei
 msgid ""
 "Normally the choice of language is determined by your browser's language "
 "setting, which is: %1.  You can change this setting using:"
-msgstr "Die aktuelle Sprache wird durch die Einstellungen Ihres Browsers bestimmt, diese sind: %1. Sie können die Einstellungen wie folgt ändern:"
+msgstr "Die aktuelle Sprache wird durch die Einstellungen Ihres Browsers bestimmt, diese ist: %1. Sie können die Einstellungen wie folgt ändern:"
 
 #: ../user/language_select.php:83
 msgid "Firefox: Tools/Options/General"
@@ -4789,7 +4853,7 @@ msgid ""
 "Or you can select a language by clicking on one of the links.  This will "
 "send your browser a cookie; make sure your browser accepts cookies from our "
 "domain."
-msgstr "Oder Sie können auch direkt eine Sprache aus der unteren Liste auswählen. Dadurch wird ein Cookie gesetzt. Bitte stellen Sie sicher das Ihr Browser Cookies von unserer Domain gestattet."
+msgstr "Oder Sie können auch direkt eine Sprache aus der unteren Liste auswählen. Dadurch wird ein Cookie gesetzt. Bitte stellen Sie sicher, dass Ihr Browser Cookies von unserer Domain gestattet."
 
 #: ../user/language_select.php:95
 msgid "Language name (click to select)"
@@ -4797,7 +4861,7 @@ msgstr "Sprachauswahl (klicken zum auswählen)"
 
 #: ../user/language_select.php:97
 msgid "Use browser language setting"
-msgstr "Browsereinstellungen verwenden"
+msgstr "Browserspracheinstellungen verwenden"
 
 #: ../user/language_select.php:113
 msgid ""
@@ -4805,27 +4869,7 @@ msgid ""
 "%1you can provide a translation%2."
 msgstr "Übersetzungen werden durch Freiwillige erstellt. Wenn Ihre Muttersprache nicht aufgeführt ist, können Sie selbst %1eine Übersetzung erstellen%2."
 
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "E-Mail-Adresse:"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "E-Mail-Adresse vergessen?"
-
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr "Passwort:"
-
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr "Passwort vergessen?"
-
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr "angemeldet bleiben"
-
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "oder %1Konto erstellen%2."
 
@@ -4839,7 +4883,7 @@ msgstr "PC %1 in PC %2 integriert"
 
 #: ../user/merge_by_name.php:72
 msgid "Return to the list of your computers"
-msgstr "Zurück zur Liste der Computer"
+msgstr "Zurück zur Liste Ihrer Computer"
 
 #: ../user/merge_by_name.php:76
 msgid ""
@@ -4903,7 +4947,7 @@ msgid ""
 "This moderation policy is set by the %1 project.\n"
 "If you have comments about the policy, email %2.\n"
 "\n"
-msgstr "\n<p>\nModeratoren können Beiträge löschen die gegen einer dieser Regeln verstoßen.\nDie Autoren der gelöschten Beiträge werden per email benachrichtigt.\nBei schwerwiegenden Verstößen wird dem Benutzer vorrübergehend die Fähigkeit Nachrichten zu schreiben entzogen.\n(Um Missbrauch zu verhindern haben daher nur Projektadministratoren die Möglichkeit dies zu tun).\nWeitere Arten von schlechtem Verhalten sind (\"Phishing\" das ausspähen von\nIP-Adressen und anderer Daten der Benutz [...]
+msgstr "\n<p>\nModeratoren können Beiträge löschen die gegen eine der folgenden Regeln verstoßen.\nDie Autoren der gelöschten Beiträge werden per E-Mail benachrichtigt.\nBei schwerwiegenden Verstößen wird dem Benutzer vorrübergehend die Fähigkeit Nachrichten zu schreiben entzogen.\n(Um Missbrauch zu verhindern haben daher nur Projektadministratoren die Möglichkeit dies zu tun).\nWeitere Arten von schlechtem Verhalten sind (\"Phishing\" das Ausspähen von\nIP-Adressen und anderer Daten der [...]
 
 #: ../user/pending.php:66
 msgid "Pending credit"
@@ -4949,244 +4993,248 @@ msgstr "Sie haben keine privaten Nachrichten."
 msgid "Sender and date"
 msgstr "Absender und Zeit"
 
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "Auf diese Nachricht antworten"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "Diese Nachricht löschen"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
 msgstr "Alle abwählen"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
 msgstr "Ausgewählte Nachrichten löschen"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
 msgstr "Absender"
 
-#: ../user/pm.php:143
+#: ../user/pm.php:148
 msgid "Date"
 msgstr "Datum"
 
-#: ../user/pm.php:185
+#: ../user/pm.php:190
 msgid "You need to fill all fields to send a private message"
 msgstr "Sie müssen alle Eingabefelder ausfüllen, um eine private Nachricht zu senden"
 
-#: ../user/pm.php:188
+#: ../user/pm.php:193
 msgid ""
 "Your message was flagged as spam\n"
 "                by the Akismet anti-spam system.\n"
 "                Please modify your text and try again."
 msgstr "Ihr verwendeter Text wurde vom Akismet Anti-Spam-System als Spam erkannt. Bitte verändern Sie Ihren Text und versuchen Sie es erneut."
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr "Benutzer mit der ID %1 konnte nicht gefunden werden"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr "Benutzer mit dem Benutzernamen %1 konnte nicht gefunden werden"
 
-#: ../user/pm.php:212
+#: ../user/pm.php:217
 msgid "%1 is not a unique username; you will have to use user ID"
 msgstr "%1 ist kein einmaliger Benutzername; Sie müssen die Benutzer-ID verwenden"
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
 msgstr "Der Benutzer %1 (ID: %2) möchten keine privaten Nachrichten von Ihnen erhalten."
 
-#: ../user/pm.php:240 ../user/view_profile.php:26
+#: ../user/pm.php:245 ../user/view_profile.php:28
 msgid "No such user"
 msgstr "Benutzer nicht gefunden"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
 msgstr "%1 wirklich blockieren?"
 
-#: ../user/pm.php:243
+#: ../user/pm.php:248
 msgid ""
 "Are you really sure you want to block user %1 from sending you private "
 "messages?"
 msgstr "Möchten Sie wirklich keine privaten Nachrichten mehr vom Benutzer %1 erhalten?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
 msgstr "Bitte beachten Sie, dass Sie nur eine begrenzte Anzahl Benutzer blockieren können."
 
-#: ../user/pm.php:245
+#: ../user/pm.php:250
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
 msgstr "Sobald Sie den Benutzer blockiert haben, können Sie die Blockierung in den Foren-Einstellungen wieder aufheben."
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
 msgstr "Nein, abbrechen"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
 msgstr "Benutzer nicht gefunden"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
 msgstr "Benutzer %1 blockiert"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
 msgstr "Benutzer %1 kann Ihnen keine weiteren privaten Nachrichten senden."
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
 msgstr "Die Blockierung können Sie in den %1Einstellungen für das Diskussionsforum %2 aufheben."
 
-#: ../user/pm.php:302
+#: ../user/pm.php:307
 msgid "Unknown action"
 msgstr "Unbekannte Aktion"
 
-#: ../user/prefs.php:32
+#: ../user/prefs.php:33
 msgid ""
 "Your preferences have been updated, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "Ihre Einstellungen wurden aktualisiert. Clienteinstellungen\nwerden aktiviert wenn der Computer mit %1 kommuniziert\noder der %2Aktualisieren%3 Knopf im Manager geklickt wurde."
 
-#: ../user/prefs.php:41
+#: ../user/prefs.php:42
 msgid ""
 "Your preferences have been reset to the defaults, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "Ihre Einstellungen wurden auf den Standard zurückgesetzt. Clienteinstellungen\nwerden aktiviert wenn der Computer mit %1 kommuniziert\noder der %2Aktualisieren%3 Knopf im Manager geklickt wurde."
 
-#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+#: ../user/prefs_edit.php:66 ../user/prefs_edit.php:94
 msgid "%1 for %2"
 msgstr "%1 für %2"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
 msgstr "Zurück zu den Einstellungen"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
 msgstr "Löschen der Einstellungen bestätigen"
 
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:49
 msgid "Are you sure you want to delete your separate %1 preferences for %2?"
-msgstr "Bist du sicher das die %1 Einstellungen für %2 gelöscht werden sollen?"
+msgstr "Bist du sicher, dass die %1 Einstellungen für %2 gelöscht werden sollen?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
 msgstr "Einstellungen entfernen"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "Profile"
+
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
-msgstr "%1Profile%2 geben den Benutzern die Möglichkeit Ihre Ansichten und Meinungen zur %3 Community auszudrücken."
+msgstr "%1Profile%2 geben den Nutzern die Möglichkeit Ihre Ansichten und Meinungen zur %3 Community auszudrücken."
 
-#: ../user/profile_menu.php:36
+#: ../user/profile_menu.php:38
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
-msgstr "Entdecken Sie die Vielfalt der anderen Benutzer und stellen Sie Ihre eigenen Ansichten dar."
+msgstr "Entdecken Sie die Vielfalt der anderen Freiwilligen und stellen Sie Ihre eigenen Ansichten dar."
 
-#: ../user/profile_menu.php:37
+#: ../user/profile_menu.php:39
 msgid ""
 "If you haven't already, you can %1create your own user profile%2 for others "
 "to see!"
 msgstr "Falls nicht schon vorhanden, sollten Sie Ihr %1eigenes Benutzerprofil anlegen%2 und den anderen Benutzern zeigen!"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
-msgstr "Benutzer des Tages"
+msgstr "Nutzer des Tages"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
-msgstr "Benutzerprofile entdecken"
+msgstr "Nutzerprofile entdecken"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
-msgstr "%1Bildergalerie der Benutzer%2 anschauen."
+msgstr "%1Bildergalerie der Nutzer%2 anschauen."
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr "Durchsuchen der Profile %1nach Ländern%2."
 
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:64
 msgid ""
 "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
 "without pictures%2."
 msgstr "Durchsuchen der Profile %1per Zufall%2, %3per Zufall mit Bildern%2 oder %4per Zufall ohne Bilder%2."
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
 msgstr "Profile nach Alphabet sortiert:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
 msgstr "Profiltexte durchsuchen"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
 msgstr "Keine Profile vorhanden"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
 msgstr "Keine Profile entsprachen Ihren Kriterien."
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
 msgstr "Ungültige Wahl"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
 msgstr "Stimme gespeichert"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
 msgstr "Dankeschön"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
 msgstr "Ihre Empfehlung wurde gespeichert."
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
 msgstr "Ihre Stimme zur Abweisung dieses Profils wurde gespeichert."
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
 msgstr "Zum Profil zurückkehren."
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
 msgstr "Profile die '%1' enthalten"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
-msgstr "Benutzername"
+msgstr "Nutzername"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
-msgstr "beigetreten am"
+msgstr "dem Projekt beigetreten am"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "Zuletzt verdiente Punkte"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
 msgstr "Keine Profile die '%1' enthalten gefunden"
 
@@ -5208,155 +5256,67 @@ msgstr "Zugang verweigert"
 
 #: ../user/results.php:69
 msgid "Missing user ID or host ID"
-msgstr "Fehlende Benutzer oder Rechner ID"
+msgstr "Fehlende Nutzer oder Rechner ID"
 
 #: ../user/results.php:107
 msgid "No tasks to display"
 msgstr "Keine Aufgaben verfügbar"
 
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr "Gestartet"
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "Nutzer des Tages"
 
-#: ../user/server_status.php:100
+#: ../user/server_status.php:59
 msgid "Not Running"
 msgstr "Nicht gestartet"
 
-#: ../user/server_status.php:103
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "Gestartet"
+
+#: ../user/server_status.php:67
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../user/server_status.php:231
+#: ../user/server_status.php:105
 msgid "Project status"
 msgstr "Projektstatus"
 
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr "Softwareversion des Servers: %1"
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "Serverstatus"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Program"
 msgstr "Programm"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Host"
 msgstr "Rechner"
 
-#: ../user/server_status.php:252
-msgid "data-driven web pages"
-msgstr "Datenbankbasierte Webseiten"
-
-#: ../user/server_status.php:258
-msgid "upload/download server"
-msgstr "Upload/Download Server"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Version des Datenbankschemas:"
 
-#: ../user/server_status.php:261
-msgid "scheduler"
-msgstr "Scheduler"
-
-#: ../user/server_status.php:294
-msgid "Running:"
-msgstr "Gestartet:"
-
-#: ../user/server_status.php:295
-msgid "Program is operating normally"
-msgstr "Programm läuft normal"
-
-#: ../user/server_status.php:296
-msgid "Not Running:"
-msgstr "Nicht gestartet:"
-
-#: ../user/server_status.php:297
-msgid "Program failed or the project is down"
-msgstr "Programm produzierte Fehler oder das Projekt ist gestoppt"
-
-#: ../user/server_status.php:298
-msgid "Disabled:"
-msgstr "Deaktiviert:"
-
-#: ../user/server_status.php:299
-msgid "Program is disabled"
-msgstr "Programm ist deaktiviert"
-
-#: ../user/server_status.php:303
+#: ../user/server_status.php:134
 msgid "Computing status"
 msgstr "Status der Berechnung"
 
-#: ../user/server_status.php:309
-msgid "The database server is not accessible"
-msgstr "Der Datenbankserver ist nicht verfügbar."
-
-#: ../user/server_status.php:326
-msgid "Tasks ready to send"
-msgstr "Aufgaben bereit zum versenden"
-
-#: ../user/server_status.php:331 ../user/workunit.php:55
-msgid "Tasks in progress"
-msgstr "Aufgaben in Arbeit"
-
-#: ../user/server_status.php:336
-msgid "Workunits waiting for validation"
-msgstr "Arbeitspakete warten auf Überprüfung"
-
-#: ../user/server_status.php:341
-msgid "Workunits waiting for assimilation"
-msgstr "Arbeitspakete warten auf Aufnahme"
-
-#: ../user/server_status.php:346
-msgid "Workunits waiting for file deletion"
-msgstr "Arbeitspakete bereit zum Löschen"
-
-#: ../user/server_status.php:351
-msgid "Tasks waiting for file deletion"
-msgstr "Aufgaben bereit zum Löschen"
-
-#: ../user/server_status.php:367
-msgid "Transitioner backlog (hours)"
-msgstr "Rückstand des Transitioners (Stunden)"
-
-#: ../user/server_status.php:374
+#: ../user/server_status.php:149
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../user/server_status.php:377 ../user/server_status.php:395
-msgid "with recent credit"
-msgstr "mit zuletzt verdienten Punkten"
-
-#: ../user/server_status.php:382 ../user/server_status.php:400
-msgid "with credit"
-msgstr "mit Punkten"
-
-#: ../user/server_status.php:387 ../user/server_status.php:405
-msgid "registered in past 24 hours"
-msgstr "registriert in den letzten 24h"
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr "aktuelle GigaFLOPs"
-
-#: ../user/server_status.php:420
+#: ../user/server_status.php:161
 msgid "Tasks by application"
 msgstr "Aufgaben pro Anwendung"
 
-#: ../user/server_status.php:423 ../user/workunit.php:40
-msgid "application"
-msgstr "Anwendung"
-
-#: ../user/server_status.php:424
-msgid "unsent"
-msgstr "ungesendet"
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "Laufzeiten der letzten 100 Aufgaben in h: durchschnitt, min, max"
 
-#: ../user/server_status.php:425
-msgid "in progress"
-msgstr "in Bearbeitung"
-
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
-msgstr "Durchschnittliche Laufzeit der letzten 100 Berechnungen in h (min-max)"
-
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr "Benutzer in den letzten 24h"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "Benutzer in den letzten 24 Stunden"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5366,679 +5326,701 @@ msgstr "Computer %1"
 msgid "Statistics and leaderboards"
 msgstr "Statistiken und Ranglisten"
 
-#: ../user/stats.php:28
+#: ../user/stats.php:30
 msgid "Statistics for %1"
 msgstr "Statistiken von %1"
 
-#: ../user/stats.php:37
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "Die besten Benutzer"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "Die besten Teams"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "Die besten Computer"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "Grafikkarten-Modelle"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "Prozessor-Modelle"
+
+#: ../user/stats.php:53
 msgid ""
 "More detailed statistics for %1 and other BOINC-based projects are available"
 " at several web sites:"
 msgstr "Mehr detaillierte Statistiken von %1 und anderen BOINC-basierten Projekten sind auf den folgenden Webseiten verfügbar:"
 
-#: ../user/stats.php:40
+#: ../user/stats.php:56
 msgid ""
 "You can also get your current statistics in the form of a \"signature "
 "image\":"
 msgstr "Sie können außerdem Ihre aktuelle Statistik in Form eines Signaturbildes bekommen:"
 
-#: ../user/stats.php:43
+#: ../user/stats.php:59
 msgid ""
 "Additionally you can get your individual statistics summed across all BOINC "
 "projects from several sites; see your %1home page%2."
 msgstr "Eine Zusammenfassung der Statistik für alle BOINC Projekte, an denen Sie teilnehmen, finden Sie auf %1Ihrer Kontoseite%2."
 
 #: ../user/team.php:27
+msgid "Teams"
+msgstr "Teams"
+
+#: ../user/team.php:29
 msgid "%1 participants may form %2teams%3."
 msgstr "%1 Benutzer können %2Teams%3 bilden."
 
-#: ../user/team.php:29
+#: ../user/team.php:31
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
 msgstr "Sie können nur einem Team gleichzeitig angehören. Sie können allerdings das Team jederzeit wechseln."
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
 msgstr "Jedes Team besitzt einen %1Gründer%2 welcher:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
 msgstr "die E-Mail-Adressen der Mitglieder einsehen kann,"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
 msgstr "den Namen und die Beschreibung des Teams ändern kann,"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
-msgstr "Hinzufügen oder entfernen von Teamadmins"
+msgstr "Team-Administratoren hinzufügen oder entfernen"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
 msgstr "Mitglieder aus dem Team entfernen kann,"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
 msgstr "ein Team auflösen kann, wenn es keine Mitglieder mehr hat."
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
 msgstr "Um einem Team beizutreten besuchen Sie die Teamseite und benutzen Sie den %1Diesem Team beitreten%2 Link."
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
 msgstr "Ein Team finden"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
 msgstr "Alle Teams"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
 msgstr "Teams vom Typ %1"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
 msgstr "Neues Team erstellen"
 
-#: ../user/team.php:59
+#: ../user/team.php:61
 msgid ""
 "If you cannot find a team that is right for you, you can %1create a team%2."
 msgstr "Wenn Sie kein passendes Team finden können dann sollten Sie ein %1neues Team erstellen%2."
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
 msgstr "Teamadmin-Status von diesem Mitglied entfernen"
 
-#: ../user/team_admins.php:40 ../user/team_admins.php:51
+#: ../user/team_admins.php:42 ../user/team_admins.php:53
 msgid "Add or remove Team Admins"
 msgstr "Hinzufügen oder entfernen von Teamadmins"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
 msgstr "Sie können Mitglieder zu Team-Administratoren machen. Diese können:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "Teameinstellungen ändern (Name, URL, Beschreibung, Land)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
 msgstr "die Beitritts-/Austrittshistorie ansehen"
 
-#: ../user/team_admins.php:45
+#: ../user/team_admins.php:47
 msgid ""
 "Moderate the team forum, if any (admins get email notification of moderation"
 " events and red X reports)"
 msgstr "das Teamforum moderieren, wenn vorhanden (Admins bekommen bei Vorkommnissen eine Nachricht per E-Mail)"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
 msgstr "Team-Administratoren können nicht:"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
 msgstr "den Team-Gründer ändern"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
 msgstr "Mitglieder entfernen"
 
-#: ../user/team_admins.php:53
+#: ../user/team_admins.php:55
 msgid "If a Team Admin quits the team, they cease to be a Team Admin."
 msgstr "Wenn ein Administrator das Team verlässt ist er nicht mehr länger Team-Administrator."
 
-#: ../user/team_admins.php:54
+#: ../user/team_admins.php:56
 msgid ""
 "We recommend that you select only people you know and trust very well as "
 "Team Admins."
-msgstr "Wir empfehlen das Sie nur Mitglieder zu Administratoren machen die Sie kennen und dievertrauenswürdig sind."
+msgstr "Wir empfehlen das Sie nur Mitglieder zu Administratoren machen die Sie kennen und die vertrauenswürdig sind."
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
 msgstr "Es gibt zur Zeit keine Team-Administratoren."
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
 msgstr "Aktuelle Team-Administratoren"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
 msgstr "Administrator seit"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
 msgstr "Team-Administrator hinzufügen"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
 msgstr "E-Mail-Adresse des Teammitglieds:"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
 msgstr "Entfernen des Admins fehlgeschlagen"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
 msgstr "Benutzer ist nicht Mitglied eines Teams"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
 msgstr "%1 ist bereits Admin von %2"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
 msgstr "Admin konnte nicht hinzugefügt werden"
 
-#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
+#: ../user/team_admins.php:113 ../user/team_manage.php:85
+#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:30
 msgid "No such team"
 msgstr "Kein Team gefunden"
 
-#: ../user/team_change_founder_action.php:30
-#: ../user/team_change_founder_form.php:33 ../user/team_display.php:67
-#: ../user/team_edit_action.php:30 ../user/team_edit_form.php:29
-#: ../user/team_email_list.php:55
+#: ../user/team_change_founder_action.php:32
+#: ../user/team_change_founder_form.php:35 ../user/team_display.php:69
+#: ../user/team_edit_action.php:32 ../user/team_edit_form.php:31
+#: ../user/team_email_list.php:64
 msgid "no such team"
 msgstr "Kein Team gefunden"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
 msgstr "Benutzer ist nicht Mitglied von %1"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr "Gründer von %1 ändern"
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
 msgstr "%1 ist jetzt der Gründer von %2"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr "Gründer von %1 ändern"
 
-#: ../user/team_change_founder_form.php:43
+#: ../user/team_change_founder_form.php:45
 msgid ""
 "Team member %1 requested this team's foundership on %2, but left the team, "
 "thus canceling the request."
 msgstr "Das Mitglied %1 wollte Gründer von %2 werden, hat das Team aber zwischenzeitlich verlassen. Daher wurde die Anfrage abgebrochen."
 
-#: ../user/team_change_founder_form.php:49
+#: ../user/team_change_founder_form.php:51
 msgid ""
 "Team member %1 has requested this team's foundership. This may be because "
 "you left the team or haven't had contact with the team for a long time."
 msgstr "Das Mitglied %1 hat den Gründerstatus für dieses Team angefordert. Entweder haben Sie das Team verlassen oder schon lange keinen Kontakt mehr gesucht."
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
 msgstr "Anforderung ablehnen"
 
-#: ../user/team_change_founder_form.php:58
+#: ../user/team_change_founder_form.php:60
 msgid ""
 "If you don't decline the request by %1, %2 will have the option of assuming team foundership.<br /><br />\n"
 "                  To accept the request, assign foundership to %3 using the form below."
-msgstr "Wenn Sie die Anfrage nicht bis %1 beantworten, wird %2 die Möglichkeit bekommen den Gründerstatus zu übernehmen.<br /><br />\nUm die Anfrage von %3 zu akzeptieren, benutze das untere Formular"
+msgstr "Wenn Sie die Anfrage nicht bis %1 beantworten, wird %2 die Möglichkeit bekommen den Gründerstatus zu übernehmen.<br /><br />\nUm die Anfrage von %3 zu akzeptieren, einfach das folgende Formular benutzen."
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
 msgstr "Keine laufende Übernahmeanfrage."
 
-#: ../user/team_change_founder_form.php:69
+#: ../user/team_change_founder_form.php:71
 msgid ""
 "To assign foundership of this team to another member, check the box next to "
 "member name and click <strong>Change founder</strong> below."
 msgstr "Um den Gründerstatus dieses Teams an einen anderen Benutzer zu geben muss die Box neben dem Namen gewählt werden und mit dem Knopf <strong>Gründer wechseln</strong> bestätigt werden."
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
 msgstr "Neuer Gründer?"
 
-#: ../user/team_change_founder_form.php:105 ../user/team_manage.php:56
+#: ../user/team_change_founder_form.php:107 ../user/team_manage.php:58
 msgid "Change founder"
 msgstr "Gründer wechseln"
 
-#: ../user/team_change_founder_form.php:108
+#: ../user/team_change_founder_form.php:110
 msgid "There are no users to transfer team to."
 msgstr "Es gibt keinen Benutzer der das Team übernehmen kann."
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
 msgstr "Der Name des Teams darf nicht leer sein."
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
 msgstr "Das Team %1 besteht bereits, bitte wählen Sie einen anderen Namen."
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
 msgstr "Das Team konnte nicht erstellt werden, bitte später noch einmal probieren."
 
-#: ../user/team_create_form.php:27 ../user/team_create_form.php:32
+#: ../user/team_create_form.php:29 ../user/team_create_form.php:34
 msgid "Create a team"
 msgstr "Ein Team erstellen"
 
-#: ../user/team_create_form.php:30
+#: ../user/team_create_form.php:32
 msgid ""
 "You belong to %1. You must %2quit this team%3 before creating a new one."
 msgstr "Du bist Mitglied von %1. Du musst aus dem %2Team austreten%3 um ein neues zu erstellen."
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
 msgstr "Nicht Gründer oder Admin"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
 msgstr "Teamhistorie von %1"
 
-#: ../user/team_delta.php:75
+#: ../user/team_delta.php:76
 msgid "When"
 msgstr "Wann"
 
-#: ../user/team_delta.php:76
+#: ../user/team_delta.php:77
 msgid "User"
 msgstr "Benutzer"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
 msgstr "Aktion"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
 msgstr "Gesamtpunkte zum Zeitpunkt der Aktion"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
 msgstr "falsches Land"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
 msgstr "Der Name '%1' wird bereits von einem anderen Team verwendet."
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
 msgstr "Ein Teamname muss angegeben werden."
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
 msgstr "Das Team konnte nicht aktualisiert werden, bitte später noch einmal probieren."
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
 msgstr "%1 bearbeiten"
 
-#: ../user/team_edit_form.php:34
+#: ../user/team_edit_form.php:36
 msgid "Update team info"
 msgstr "Teaminformationen aktualisieren"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
 msgstr "E-Mailverzeichnis von %1"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr "Mitgliederverzeichnis von %1"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
 msgstr "Als reinen Text anzeigen"
 
-#: ../user/team_forum.php:28 ../user/team_forum.php:39
+#: ../user/team_forum.php:30 ../user/team_forum.php:41
 msgid "Create Message Board"
 msgstr "Diskussionsforum erstellen"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
 msgstr "Ein Diskussionsforum zur Nutzung durch %1 erstellen."
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
 msgstr "Nur Mitglieder des Teams können Beiträge verfassen."
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
 msgstr "Optional können auch nur Mitglieder das Forum sehen."
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
-msgstr "Der Gründer und die Team-Admins haben Moderatorrechte."
+msgstr "Der Gründer und die Team-Admins haben Moderatorenrechte."
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "Ein Diskussionsforum für %1 erstellen"
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
 msgstr "Das Team hat bereits ein Diskussionsforum."
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
 msgstr "Diskussionsforum des Teams"
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
 msgstr "Mindestzeit zwischen Beiträgen (Sekunden)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "Mindestpunktzahl (Gesamt) für Schreibrecht"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "Mindestpunktzahl (Durchschnitt) für Schreibrecht"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
 msgstr "Übertragen"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
 msgstr "Diskussionsforum des Teams entfernen."
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
 msgstr "Das Diskussionsforum wirklich entfernen?"
 
-#: ../user/team_forum.php:98
+#: ../user/team_forum.php:100
 msgid ""
 "Are you sure you want to remove your team's message board? All threads and "
 "posts will be permanently removed. (You may, however, create a new message "
 "board later)."
 msgstr "Soll das Diskussionsforum wirklich entfernt werden? Alle Beiträge werden unwiderruflich gelöscht. Es kann aber danach ein neues (leeres) Diskussionsforum angelegt werden."
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
 msgstr "Ja - Forum entfernen"
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
 msgstr "Diskussionsforum entfernt"
 
-#: ../user/team_forum.php:124
+#: ../user/team_forum.php:126
 msgid ""
 "Your team's message board has been removed. You may now %1create a new "
 "one%2."
 msgstr "Das Diskussionsforum des Teams wurde entfernt. Es kann jetzt ein %1neues angelegt werden%2."
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
 msgstr "Diskussionsforum des Teams aktualisiert"
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
 msgstr "Aktualisierung erfolgreich"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
 msgstr "Aktualisierung fehlgeschlagen"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "Das Team hat kein Forum"
 
-#: ../user/team_founder_transfer_action.php:36
+#: ../user/team_founder_transfer_action.php:38
 msgid "You must be a member of a team to access this page."
 msgstr "Nur Mitglieder dieses Teams haben Zugriff auf diese Seite."
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
 msgstr "Gründerstatus für %1 anfordern"
 
-#: ../user/team_founder_transfer_action.php:98
+#: ../user/team_founder_transfer_action.php:100
 msgid ""
 "The current founder has been notified of your request by email and private message.<br /><br />\n"
 "                       If the founder does not respond within 60 days you will be allowed to become the founder."
 msgstr "Der aktuelle Gründer wurde von der Anfrage per E-Mail und PN benachrichtigt.<br /><br />\nWenn der Gründer nicht innerhalb von 60 Tagen reagiert wird der Wechsel möglich sein."
 
-#: ../user/team_founder_transfer_action.php:102
-#: ../user/team_founder_transfer_action.php:113
+#: ../user/team_founder_transfer_action.php:104
+#: ../user/team_founder_transfer_action.php:115
 msgid "Foundership request not allowed now"
 msgstr "Wechsel des Gründerstatus zur Zeit nicht erlaubt"
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
 msgstr "Gründerstatus von %1 übernommen"
 
-#: ../user/team_founder_transfer_action.php:111
+#: ../user/team_founder_transfer_action.php:113
 msgid ""
 "Congratulations, you are now the founder of team %1. Go to %2Your Account "
 "page%3 to find the Team Admin options."
 msgstr "Glückwunsch, Du bist nun der Gründer von Team %1. Auf der %2Ihr Konto Seite%3 findet sich der Link zur Verwaltung des Teams."
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
 msgstr "Anfrage nach Gründerwechsel ablehnen"
 
-#: ../user/team_founder_transfer_action.php:127
+#: ../user/team_founder_transfer_action.php:129
 msgid "The foundership request from %1 has been declined."
 msgstr "Die Anfrage zum Gründerwechsel von %1 wurde abgelehnt."
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
 msgstr "Es gibt keine Anfragen zum Gründerwechsel."
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
 msgstr "unbekannte Aktion %1"
 
-#: ../user/team_founder_transfer_action.php:137
-#: ../user/team_founder_transfer_form.php:83
+#: ../user/team_founder_transfer_action.php:139
+#: ../user/team_founder_transfer_form.php:85
 msgid "Return to team page"
 msgstr "Zurück zur Teamseite"
 
-#: ../user/team_founder_transfer_form.php:28
+#: ../user/team_founder_transfer_form.php:30
 msgid "You need to be a member of a team to access this page."
 msgstr "Man muss Mitglied eines Teams sein um diese Seite anzusehen."
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
 msgstr "Gründerstatus für %1 anfordern"
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
 msgstr "Du bist nun der Gründer von Team %1."
 
-#: ../user/team_founder_transfer_form.php:44
+#: ../user/team_founder_transfer_form.php:46
 msgid "You requested the foundership of %1 on %2."
 msgstr "Du hast den Gründerstatus von %1 am %2 angefragt."
 
-#: ../user/team_founder_transfer_form.php:47
+#: ../user/team_founder_transfer_form.php:49
 msgid ""
 "60 days have elapsed since your request, and the founder has not responded. "
 "You may now assume foundership by clicking here:"
 msgstr "60 Tage sind seit der Anfrage vergangen und der Gründer hat nicht reagiert. Du kannst nun den Gründerstatus bekommen:"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
 msgstr "Gründerstatus anfordern"
 
-#: ../user/team_founder_transfer_form.php:54
+#: ../user/team_founder_transfer_form.php:56
 msgid ""
 "The founder was notified of your request. If he/she does not respond by %1 "
 "you will be given an option to become founder."
 msgstr "Der Gründer wurde über die Anfrage informiert. Wenn Er/Sie nicht bis %1 antwortet bekommst du die Möglichkeit den Gründerstatus zu übernehmen."
 
-#: ../user/team_founder_transfer_form.php:60
+#: ../user/team_founder_transfer_form.php:62
 msgid ""
 "If the team founder is not active and you want to assume the role of founder, click the button below. The current founder will be sent an email detailing your request, and will be able to transfer foundership to you or to decline your request. If the founder does not respond in 60 days, you will be allowed to become the founder.<br /><br />\n"
 "                       Are you sure you want to request foundership?"
 msgstr "Wenn der Gründer des Teams nicht mehr Aktiv ist, kann der Gründerstatus von jedem Teammitglied übernommen werden. Der aktuelle Gründer bekommt eine E-Mail mit den Informationen und kann der Übertragung zustimmen oder diese ablehnen. Sollte der Gründer nicht innerhalb von 60 Tagen antworten, besteht dann die Möglichkeit den Gründerstatus zu übernehmen.<br /><br />\nSicher das die Übernahme des Gründerstatus eingeleitet werden soll?"
 
-#: ../user/team_founder_transfer_form.php:65
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
 msgstr "Gründerstatus anfordern"
 
-#: ../user/team_founder_transfer_form.php:74
+#: ../user/team_founder_transfer_form.php:76
 msgid "Founder change has already been requested by %1 on %2."
 msgstr "Der Gründerstatus wurde bereits von %1 am %2 beantragt."
 
-#: ../user/team_founder_transfer_form.php:77
+#: ../user/team_founder_transfer_form.php:79
 msgid ""
 "A foundership change was requested during the last 90 days, so new requests "
 "are not allowed. Please try again later."
 msgstr "Innerhalb der letzten 90 Tage wurde der Gründerstatus bereits beantragt, neue Anfragen sind nicht erlaubt. Bitte später erneut versuchen."
 
-#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
+#: ../user/team_join.php:34 ../user/team_join_action.php:34
+#: ../user/team_join_form.php:31
 msgid "The team %1 is not joinable."
 msgstr "Dem Team %1 kann nicht beigetreten werden."
 
-#: ../user/team_join.php:35 ../user/team_join_action.php:35
+#: ../user/team_join.php:37 ../user/team_join_action.php:37
 msgid "Already a member"
 msgstr "Bereits Mitglied des Teams"
 
-#: ../user/team_join.php:36 ../user/team_join_action.php:36
+#: ../user/team_join.php:38 ../user/team_join_action.php:38
 msgid "You are already a member of %1."
 msgstr "Du bist bereits Mitglied im Team %1."
 
-#: ../user/team_join.php:42 ../user/team_join_action.php:43
+#: ../user/team_join.php:44 ../user/team_join_action.php:45
 msgid "Couldn't join team - please try again later."
 msgstr "Dem Team konnte nicht beigetreten werden, bitte später noch einmal probieren."
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
 msgstr "%1 beigetreten"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr "Du bist %1 beigetreten."
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr "%1 beitreten"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
 msgstr "Bitte beachten:"
 
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:37
 msgid "Joining a team gives its founder access to your email address."
 msgstr "Als Mitglied ist deine E-Mail Adresse für den Gründer einsehbar"
 
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
 msgstr "Der Beitritt hat keinen Einfluss auf deine Punkte."
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
 msgstr "Team beitreten"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
 msgstr "Suchergebnisse für '%1'"
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
 msgstr "Die Mitglieder, Statistiken und Informationen zu diesem Team anschauen."
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
 msgstr "Mehr als 100 Teams entsprachen der Suche. Nur die ersten 100 werden angezeigt."
 
-#: ../user/team_lookup.php:104
+#: ../user/team_lookup.php:106
 msgid ""
 "End of results. %1 If you cannot find the team you are looking for, you may "
 "%2create a team%3 yourself."
 msgstr "Wenn kein passendes Team gefunden wurde dann kann auch ein %1neues Team erstellt%2 werden."
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr "Verwaltung von Team %1"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
 msgstr "Teaminformationen bearbeiten"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
 msgstr "Den Namen des Teams, die URL, die Beschreibung, den Typ oder das Land ändern."
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
 msgstr "Mitgliederliste:"
 
-#: ../user/team_manage.php:33 ../user/team_manage.php:37
+#: ../user/team_manage.php:35 ../user/team_manage.php:39
 msgid "HTML"
 msgstr "HTML"
 
-#: ../user/team_manage.php:34
+#: ../user/team_manage.php:36
 msgid "text"
 msgstr "Text"
 
-#: ../user/team_manage.php:35
+#: ../user/team_manage.php:37
 msgid "View member names and email addresses"
 msgstr "Mitgliedsnamen und E-Mail Adressen anzeigen"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
 msgstr "Änderungshistorie anzeigen:"
 
-#: ../user/team_manage.php:38
+#: ../user/team_manage.php:40
 msgid "XML"
 msgstr "XML"
 
-#: ../user/team_manage.php:39
+#: ../user/team_manage.php:41
 msgid "See when members joined or quit this team"
 msgstr "Zeigt welche Mitglieder wann dem Team beigetreten sind oder dieses verlassen haben."
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
 msgstr "Auf eine Anfrage zum Gründerwechsel antworten."
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
 msgstr "Wenn nicht bis zum %1 geantwortet wurde, kann %2 den Gründerstatus dieses Teams bekommen."
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
 msgstr "Inaktive oder unerwünschte Mitglieder dieses Teams entfernen."
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
 msgstr "Den Gründerstatus auf ein anderes Mitglied übertragen."
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
 msgstr "Hinzufügen/Entfernen von Teamadmins"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
 msgstr "Die gewählten Mitglieder zu Teamadmins erklären,"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
 msgstr "Team entfernen"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
 msgstr "Nur erlaubt wenn das Team keine Mitglieder mehr hat."
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
 msgstr "Ein Diskussionsforum für das Team erstellen oder verwalten."
 
-#: ../user/team_manage.php:71
+#: ../user/team_manage.php:73
 msgid ""
 "To have this team created on all BOINC projects (current and future) you can"
 " make it into a %1BOINC-wide team%2."
 msgstr "Um dieses Team in allen BOINC-Projekten (aktuelle und zukünftige) anzulegen, kann es zu einem %1BOINC-weitem Team%2 gemacht werden."
 
-#: ../user/team_manage.php:73
+#: ../user/team_manage.php:75
 msgid ""
 "Team admins are encouraged to join and participate in the Google %1boinc-"
 "team-founders%2 group."
 msgstr "Teamadmins werden ersucht sich an der Google Gruppe %1boinc-team-founders%2 (englisch) zu beteiligen."
 
-#: ../user/team_manage.php:75
-msgid ""
-"Other resources for BOINC team admins are available from a third-party site,"
-" %1www.boincteams.com%2."
-msgstr "Andere Hilfsmittel werden von der externen Webseite %1www.boincteams.com%2 angeboten."
-
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
 msgstr "Nicht-leeres Team kann nicht gelöscht werden."
@@ -6047,27 +6029,27 @@ msgstr "Nicht-leeres Team kann nicht gelöscht werden."
 msgid "Team %1 deleted"
 msgstr "Team %1 gelöscht"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr "Limit überschritten: Nur die ersten 1000 Mitglieder können angezeigt werden."
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
 msgstr "Mitglieder von %1"
 
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
 msgid "Unable to quit team"
 msgstr "Team konnte nicht verlassen werden."
 
-#: ../user/team_quit_action.php:33
+#: ../user/team_quit_action.php:35
 msgid "Team doesn't exist, or you don't belong to it."
 msgstr "Das Team existiert nicht oder Sie sind kein Mitglied."
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
 msgstr "Verlasse %1"
 
-#: ../user/team_quit_form.php:32
+#: ../user/team_quit_form.php:34
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
@@ -6076,85 +6058,85 @@ msgid ""
 "         </ul>"
 msgstr "<strong>Vor dem Verlassen eines Teams bitte beachten:</strong>\n<ul>\n<li>Nach dem verlassen, kann man einem anderen Team oder diesem Team wieder beitreten.</li>\n<li>Das Verlassen eines Teams beeinflußt nicht die Anzahl der eigenen Punkte.</li>\n</ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
 msgstr "Team verlassen"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
 msgstr "Entferne Mitglieder aus %1"
 
-#: ../user/team_remove_inactive_action.php:39
+#: ../user/team_remove_inactive_action.php:41
 msgid "%1 is not a member of %2"
 msgstr "%1 ist nicht Mitglied von %2"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr "%1 wurde entfernt"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr "Entferne Mitglieder aus %1"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
 msgstr "Entfernen?"
 
-#: ../user/team_remove_inactive_form.php:40
+#: ../user/team_remove_inactive_form.php:42
 msgid "Name (ID)"
 msgstr "Name (ID)"
 
-#: ../user/team_remove_inactive_form.php:65
+#: ../user/team_remove_inactive_form.php:67
 msgid "No members are eligible for removal."
 msgstr "Keine Mitglieder können entfernt werden."
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
 msgstr "Mitglieder entfernen"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
 msgstr "Teamname"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
 msgstr "Ergebnisse der Teamsuche"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
 msgstr "Keine Teams mit diesen Kriterien gefunden. Bitte neue Suche starten."
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
 msgstr "Oder ein %1neues Team erstellen%2."
 
-#: ../user/team_search.php:100
+#: ../user/team_search.php:121
 msgid ""
 "The following teams match one or more of your search criteria.\n"
 "            To join a team, click its name to go to the team page,\n"
 "               then click %1Join this team%2."
 msgstr "Ein oder Mehrere Suchkriterien passen zu den folgenden Teams.\nUm einem Team beizutreten, bitte erst auf den Namen und\ndann %1diesem Team beitreten%2 klicken."
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
 msgstr "Suche ändern"
 
-#: ../user/team_search.php:181
+#: ../user/team_search.php:202
 msgid ""
 "You can team up with other people with similar interests, or from the same "
 "country, company, or school."
 msgstr "Du kannst dich mit Leuten in Teams zusammenschließen, welche die ähnlichen Interessen haben oder aus dem selben Land, Unternehmen oder Schule kommen."
 
-#: ../user/team_search.php:183
+#: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
 msgstr "Benutze dieses Formular um Teams zu finden, die vielleicht die richtigen für dich sind."
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
 msgstr "%1Ich bin im Moment nicht daran interessiert%2 einem Team beizutreten."
 
-#: ../user/top_hosts.php:67 ../user/top_teams.php:100
-#: ../user/top_users.php:112
+#: ../user/top_hosts.php:67 ../user/top_teams.php:102
+#: ../user/top_users.php:113
 msgid "Limit exceeded - Sorry, first %1 items only"
 msgstr "Höchstgrenze erreicht - Nur die ersten %1 Einträge werden angezeigt"
 
@@ -6162,11 +6144,11 @@ msgstr "Höchstgrenze erreicht - Nur die ersten %1 Einträge werden angezeigt"
 msgid "Top hosts"
 msgstr "Die besten Rechner"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "Die besten %1 Teams"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "Es gibt keine %1 Teams."
 
@@ -6174,11 +6156,11 @@ msgstr "Es gibt keine %1 Teams."
 msgid "Participant since"
 msgstr "Benutzer seit"
 
-#: ../user/uotd.php:29
+#: ../user/uotd.php:31
 msgid "No user of the day has been chosen."
 msgstr "Kein Benutzer des Tages gewählt."
 
-#: ../user/uotd.php:33
+#: ../user/uotd.php:35
 msgid "User of the Day for %1: %2"
 msgstr "Benutzer des Tages am %1: %2"
 
@@ -6222,19 +6204,19 @@ msgstr "Absteigendes Durchschnittsguthaben"
 msgid "Decreasing total credit"
 msgstr "Absteigendes Gesamtguthaben"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
 msgstr "Der Suchbegriff muss mindestens 3 Zeichen enthalten"
 
-#: ../user/user_search.php:133
+#: ../user/user_search.php:118
 msgid "User search results"
 msgstr "Ergebnisse der Benutzersuche"
 
-#: ../user/user_search.php:140
+#: ../user/user_search.php:125
 msgid "Joined"
 msgstr "Beitritt"
 
-#: ../user/user_search.php:148
+#: ../user/user_search.php:133
 msgid "No users match your search criteria."
 msgstr "Keine Benutzer entsprechen Ihren Suchkriterien."
 
@@ -6296,21 +6278,21 @@ msgstr "Aktualisierung der Datenbank fehlgeschlagen - Bitte später erneut probi
 
 #: ../user/validate_email_addr.php:57
 msgid "Validate email address"
-msgstr " BOINC E-Mail Adresse bestätigen"
+msgstr "E-Mail Adresse bestätigen"
 
 #: ../user/validate_email_addr.php:58
 msgid "The email address of your account has been validated."
 msgstr "Die E-Mail Adresse Ihres Kontos wurde bestätigt."
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
 msgstr "Dieser Benutzer hat kein Profil."
 
-#: ../user/view_profile.php:54
+#: ../user/view_profile.php:56
 msgid "Profile: %1"
 msgstr "Profil: %1"
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
 msgstr "Kontoinformationen"
 
@@ -6364,6 +6346,10 @@ msgstr "Arbeitspaket nicht gefunden"
 msgid "Workunit %1"
 msgstr "Paket %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "Anwendung"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "autorisiertes Ergebnis"
@@ -6373,6 +6359,10 @@ msgid "granted credit"
 msgstr "gewährte Punkte"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Aufgaben in Arbeit"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "unterdrückt bis zum Abschluss"
 
@@ -6400,33 +6390,33 @@ msgstr "Gültigkeit"
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: ../project.sample/project.inc:43
+#: ../project.sample/project.inc:70
 msgid "Main page"
 msgstr "Startseite"
 
-#: ../project.sample/project.inc:45
+#: ../project.sample/project.inc:72
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../project.sample/project.inc:48
+#: ../project.sample/project.inc:75
 msgid "Generated"
 msgstr "Erstellt"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
 msgstr "Informationen zu ihrer Person."
 
-#: ../project.sample/project.inc:83
+#: ../project.sample/project.inc:110
 msgid ""
 "Tell us about yourself. You could tell us where you're from, your age, "
 "occupation, hobbies, or anything else about yourself."
 msgstr "Erzähl uns etwas über dich. Du könntest etwas darüber erzählen wo du herkommst, dein Alter, Beschäftigung, Hobbys, oder andere Sachen über dich selbst."
 
-#: ../project.sample/project.inc:87
+#: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
 msgstr "Deine Meinungen zu %1"
 
-#: ../project.sample/project.inc:91
+#: ../project.sample/project.inc:118
 msgid ""
 "Tell us your thoughts about %1<ol>\n"
 "    <li>Why do you run %1?\n"
@@ -6435,24 +6425,35 @@ msgid ""
 "    </ol>"
 msgstr "Teilen Sie uns Ihre Gedanken zu %1 mit<ol>\n<li>Warum führen Sie %1 aus?\n<li>Wie ist Ihre Meinung zu diesem Projekt?\n<li>Haben Sie Hinweise oder Verbesserungsvorschläge?\n</ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
 msgstr "Farbschema für Grafiken"
 
-#: ../project.sample/project_specific_prefs.inc:48
+#: ../project.sample/project_specific_prefs.inc:55
+#, no-php-format
 msgid "Maximum CPU % for graphics%10 ... 100%2"
 msgstr "maximale CPU % für Grafiken%1 0 ... 100%2"
 
-#: ../project.sample/project_specific_prefs.inc:49
+#: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
 msgstr "Startet nur die ausgewählte Anwendung/en"
 
-#: ../project.sample/project_specific_prefs.inc:50
+#: ../project.sample/project_specific_prefs.inc:57
+msgid ""
+"Only get tasks for certain applications. Useful to focus on particular "
+"applications, or to exclude them."
+msgstr "Nur Aufgaben für bestimmte Anwendungen erlauben. Nützlich um Anwendungen zu bevorzugen oder auszuschließen."
+
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
 msgstr "Wenn keine Aufgaben für die ausgewählten Anwendungen vorhanden sind, Aufgaben von anderen Anwendungen akzeptieren?"
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "Schnellere, nicht-grafische Anwendungen verwenden, sofern verfügbar?"
+
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
 msgstr "(alle Anwendungen)"
diff --git a/locale/en/BOINC-Drupal.po b/locale/en/BOINC-Drupal.po
new file mode 100644
index 0000000..f6fdcc0
--- /dev/null
+++ b/locale/en/BOINC-Drupal.po
@@ -0,0 +1,1518 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME <EMAIL at ADDRESS>
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"POT-Creation-Date: 2015-05-07 12:21+0000\n"
+"PO-Revision-Date: 2015-05-07 12:23+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: English (http://www.transifex.com/projects/p/boinc/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, it will be used for your user picture."
+msgstr "If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with your e-mail address, it will be used for your user picture."
+
+msgid "Your Gravatar will not be shown if you upload a user picture."
+msgstr "Your Gravatar will not be shown if you upload a user picture."
+
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, use it for your user picture."
+msgstr "If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with your e-mail address, use it for your user picture."
+
+msgid "Gravatar will not be shown if an avatar is uploaded."
+msgstr "Gravatar will not be shown if an avatar is uploaded."
+
+msgid "This is not available until your profile is set up."
+msgstr "This is not available until your profile is set up."
+
+msgid "Should @project show your computers on its web site?"
+msgstr "Should @project show your computers on its web site?"
+
+msgid "Click here to revoke your membership with @this_team"
+msgstr "Click here to revoke your membership with @this_team"
+
+msgid "Minimum avg credit to post"
+msgstr "Minimum avg credit to post"
+
+msgid "Founder & Team Admins have moderator privileges"
+msgstr "Founder & Team Admins have moderator privileges"
+
+msgid "Notes about changes in foundership:"
+msgstr "Notes about changes in foundership:"
+
+msgid "Foundership can be requested by team members:"
+msgstr "Foundership can be requested by team members:"
+
+msgid "One request is allowed at a time"
+msgstr "One request is allowed at a time"
+
+msgid "Any active request must be older than 90 days"
+msgstr "Any active request must be older than 90 days"
+
+msgid "Current founder has 60 days to respond to a request"
+msgstr "Current founder has 60 days to respond to a request"
+
+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 "If a team admin quits the team, they cease to be a team admin. We recommend only selecting people you know and trust"
+
+msgid "You may create a message board for use by @team"
+msgstr "You may create a message board for use by @team"
+
+msgid "parent removed"
+msgstr "parent removed"
+
+msgid "Maximum daily WU quota per CPU"
+msgstr "Maximum daily WU quota per CPU"
+
+msgid "Received time"
+msgstr "Received time"
+
+msgid "App ID"
+msgstr "App ID"
+
+msgid "Error mask"
+msgstr "Error mask"
+
+msgid "Minimum quorum"
+msgstr "Minimum quorum"
+
+msgid "Max error tasks"
+msgstr "Max error tasks"
+
+msgid "Max success tasks"
+msgstr "Max success tasks"
+
+msgid "Max total tasks"
+msgstr "Max total tasks"
+
+msgid "Target number of results"
+msgstr "Target number of results"
+
+msgid "Application version ID"
+msgstr "Application version ID"
+
+msgid "Plan class"
+msgstr "Plan class"
+
+msgid "Version number"
+msgstr "Version number"
+
+msgid "App version ID"
+msgstr "App version ID"
+
+msgid "@count million ops/sec"
+msgstr "@count million ops/sec"
+
+msgid "@rate KiB/sec"
+msgstr "@rate KiB/sec"
+
+msgid "@count days"
+msgstr "@count days"
+
+msgid "@ip_address (same the last @count times)"
+msgstr "@ip_address (same the last @count times)"
+
+msgid "commented on"
+msgstr "commented on"
+
+msgid "Remove sticky status from this topic"
+msgstr "Remove sticky status from this topic"
+
+msgid ""
+"Check the computers that are the same as @name (created on @date at @time "
+"with computer ID @id)"
+msgstr "Check the computers that are the same as @name (created on @date at @time with computer ID @id)"
+
+msgid "Computer @old_id has been merged successfully into @id."
+msgstr "Computer @old_id has been merged successfully into @id."
+
+msgid "started discussion"
+msgstr "started discussion"
+
+msgid "posted"
+msgstr "posted"
+
+msgid "Minimum value not met for @field"
+msgstr "Minimum value not met for @field"
+
+msgid "Invalid data type for @field"
+msgstr "Invalid data type for @field"
+
+msgid ""
+"Authentication is required when changing E-mail address or setting new "
+"password."
+msgstr "Authentication is required when changing E-mail address or setting new password."
+
+msgid "Request foundership"
+msgstr "Request foundership"
+
+msgid ""
+"If the team founder is not active and you want to assume the role of "
+"founder, click below to request foundership of @this_team."
+msgstr "If the team founder is not active and you want to assume the role of founder, click below to request foundership of @this_team."
+
+msgid "Initiate request"
+msgstr "Initiate request"
+
+msgid "A BOINC account already exists for @email."
+msgstr "A BOINC account already exists for @email."
+
+msgid ""
+"Please be responsible in what you write and do not create posts which are "
+"offensive or insulting. Offensive posts or threads may be deleted by forum "
+"moderators without warning or discussion. Do not respond to offensive "
+"postings. Click on the \"report\" button at the bottom of the post to call "
+"it to the attention of the moderators."
+msgstr "Please be responsible in what you write and do not create posts which are offensive or insulting. Offensive posts or threads may be deleted by forum moderators without warning or discussion. Do not respond to offensive postings. Click on the \"report\" button at the bottom of the post to call it to the attention of the moderators."
+
+msgid "this project"
+msgstr "this project"
+
+msgid ""
+"We also ask that you keep all discussion on the message boards related to "
+"@project or BOINC with the small exception of the Science message board "
+"where you are free to discuss anything relevant to the underlying science. "
+"Participants interested in broader discussions should post to unofficial "
+"forums for @project."
+msgstr "We also ask that you keep all discussion on the message boards related to @project or BOINC with the small exception of the Science message board where you are free to discuss anything relevant to the underlying science. Participants interested in broader discussions should post to unofficial forums for @project."
+
+msgid "These message boards now support BBCode tags only."
+msgstr "These message boards now support BBCode tags only."
+
+msgid "Posts contributed"
+msgstr "Posts contributed"
+
+msgid "Profile awaiting moderator approval"
+msgstr "Profile awaiting moderator approval"
+
+msgid "Approve profile"
+msgstr "Approve profile"
+
+msgid "Approve this profile content"
+msgstr "Approve this profile content"
+
+msgid "Edit profile"
+msgstr "Edit profile"
+
+msgid "Edit the content of this profile"
+msgstr "Edit the content of this profile"
+
+msgid "Remove profile"
+msgstr "Remove profile"
+
+msgid "Remove this profile content from the system"
+msgstr "Remove this profile content from the system"
+
+msgid "The team founder has @count days to respond to your transfer request."
+msgstr "The team founder has @count days to respond to your transfer request."
+
+msgid "Reject profile"
+msgstr "Reject profile"
+
+msgid "Reject this profile content"
+msgstr "Reject this profile content"
+
+msgid "Reason for rejecting this profile"
+msgstr "Reason for rejecting this profile"
+
+msgid ""
+"This reason will be included in an email to the user. Please write a brief "
+"explanation of the problem and how to fix it."
+msgstr "This reason will be included in an email to the user. Please write a brief explanation of the problem and how to fix it."
+
+msgid "Submit"
+msgstr "Submit"
+
+msgid "project"
+msgstr "project"
+
+msgid "Email address"
+msgstr "Email address"
+
+msgid "Home"
+msgstr "Home"
+
+msgid "Login"
+msgstr "Login"
+
+msgid "search"
+msgstr "search"
+
+msgid "Server status"
+msgstr "Server status"
+
+msgid "Language"
+msgstr "Language"
+
+msgid "Enter your @s email address."
+msgstr "Enter your @s email address."
+
+msgid "Join now"
+msgstr "Join now"
+
+msgid "I'm new"
+msgstr "I'm new"
+
+msgid "I'm a BOINC user"
+msgstr "I'm a BOINC user"
+
+msgid "Welcome back!"
+msgstr "Welcome back!"
+
+msgid ""
+"Einstein at 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 at 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."
+
+msgid "Learn more"
+msgstr "Learn more"
+
+msgid "View account"
+msgstr "View account"
+
+msgid "About our screensaver"
+msgstr "About our screensaver"
+
+msgid "Over 500,000 volunteers and counting."
+msgstr "Over 500,000 volunteers and counting."
+
+msgid "Windows"
+msgstr "Windows"
+
+msgid "Mac"
+msgstr "Mac"
+
+msgid "Linux"
+msgstr "Linux"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Avg credit"
+msgstr "Avg credit"
+
+msgid "Total credit"
+msgstr "Total credit"
+
+msgid "Enter your password to save changes"
+msgstr "Enter your password to save changes"
+
+msgid ""
+"Enter your current password if changing your email\n"
+"          address or password."
+msgstr "Enter your current password if changing your email\n          address or password."
+
+msgid "BOINC user ID"
+msgstr "BOINC user ID"
+
+msgid "Drupal user ID"
+msgstr "Drupal user ID"
+
+msgid "Account key"
+msgstr "Account key"
+
+msgid "Weak account key"
+msgstr "Weak account key"
+
+msgid "Cross-project ID"
+msgstr "Cross-project ID"
+
+msgid "Save changes"
+msgstr "Save changes"
+
+msgid "Cancel"
+msgstr "Cancel"
+
+msgid "Change password"
+msgstr "Change password"
+
+msgid "What is @this_project?"
+msgstr "What is @this_project?"
+
+msgid "no projects..."
+msgstr "no projects..."
+
+msgid "Download the desktop software"
+msgstr "Download the desktop software"
+
+msgid "Run the installer"
+msgstr "Run the installer"
+
+msgid "When prompted enter @siteurl"
+msgstr "When prompted enter @siteurl"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Enter the password that accompanies your username."
+msgstr "Enter the password that accompanies your username."
+
+msgid "Request new password"
+msgstr "Request new password"
+
+msgid ""
+"If you're already running BOINC, select <i>Add\n"
+"      Project</i>."
+msgstr "If you're already running BOINC, select <i>Add\n      Project</i>."
+
+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 "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."
+
+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 "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."
+
+msgid ""
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) If you know your account's email address, and you can receive email there:"
+
+msgid ""
+"Enter the email address and click OK. You will be sent email instructions "
+"for resetting your password."
+msgstr "Enter the email address and click OK. You will be sent email instructions for resetting your password."
+
+msgid "OK"
+msgstr "OK"
+
+msgid "The latest news from the @site_name project"
+msgstr "The latest news from the @site_name project"
+
+msgid "Comment form"
+msgstr "Comment form"
+
+msgid "Total credits"
+msgstr "Total credits"
+
+msgid "Recent avg credits"
+msgstr "Recent avg credits"
+
+msgid "Country"
+msgstr "Country"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "Founder"
+msgstr "Founder"
+
+msgid "New members in last day"
+msgstr "New members in last day"
+
+msgid "Total members"
+msgstr "Total members"
+
+msgid "Active members"
+msgstr "Active members"
+
+msgid "Members with credit"
+msgstr "Members with credit"
+
+msgid "Description"
+msgstr "Description"
+
+msgid "Search teams"
+msgstr "Search teams"
+
+msgid "Send message"
+msgstr "Send message"
+
+msgid "BOINC"
+msgstr "BOINC"
+
+msgid "Project"
+msgstr "Project"
+
+msgid "Web site"
+msgstr "Web site"
+
+msgid "No active computers"
+msgstr "No active computers"
+
+msgid "This user has no computers that have been active in the last 30 days."
+msgstr "This user has no computers that have been active in the last 30 days."
+
+msgid " Default value: @default"
+msgstr " Default value: @default"
+
+msgid "Applications"
+msgstr "Applications"
+
+msgid "yes"
+msgstr "yes"
+
+msgid "no"
+msgstr "no"
+
+msgid "Message @id"
+msgstr "Message @id"
+
+msgid "message @id"
+msgstr "message @id"
+
+msgid " in response to !parent"
+msgstr " in response to !parent"
+
+msgid "Credits per day"
+msgstr "Credits per day"
+
+msgid "Computers hidden"
+msgstr "Computers hidden"
+
+msgid "This user has chosen not to show information about their computers."
+msgstr "This user has chosen not to show information about their computers."
+
+msgid "Stderr output"
+msgstr "Stderr output"
+
+msgid "@time ago"
+msgstr "@time ago"
+
+msgid "n/a"
+msgstr "n/a"
+
+msgid "Submitted by !username on !datetime"
+msgstr "Submitted by !username on !datetime"
+
+msgid "Member since"
+msgstr "Member since"
+
+msgid "View team"
+msgstr "View team"
+
+msgid "Friends (@count)"
+msgstr "Friends (@count)"
+
+msgid "Website"
+msgstr "Website"
+
+msgid "Locked"
+msgstr "Locked"
+
+msgid "Computers pending"
+msgstr "Computers pending"
+
+msgid ""
+"This user does not yet have any associated computers. Computers will be "
+"displayed when they have earned their first credits."
+msgstr "This user does not yet have any associated computers. Computers will be displayed when they have earned their first credits."
+
+msgid "No results found..."
+msgstr "No results found..."
+
+msgid "Background"
+msgstr "Background"
+
+msgid "Teams"
+msgstr "Teams"
+
+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 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:"
+
+msgid "access team members' email addresses"
+msgstr "access team members' email addresses"
+
+msgid "edit the team's name and description"
+msgstr "edit the team's name and description"
+
+msgid "add or remove team admins"
+msgstr "add or remove team admins"
+
+msgid "remove members from the team"
+msgstr "remove members from the team"
+
+msgid "disband a team if it has no members"
+msgstr "disband a team if it has no members"
+
+msgid "Create a new team"
+msgstr "Create a new team"
+
+msgid ""
+"If you cannot find a team that is right for you, you can create a team."
+msgstr "If you cannot find a team that is right for you, you can create a team."
+
+msgid "You must earn @count more credits!"
+msgstr "You must earn @count more credits!"
+
+msgid "Threads"
+msgstr "Threads"
+
+msgid "Posts"
+msgstr "Posts"
+
+msgid "Last post"
+msgstr "Last post"
+
+msgid "Manage subscriptions"
+msgstr "Manage subscriptions"
+
+msgid "Featured"
+msgstr "Featured"
+
+msgid "Submitted on !datetime"
+msgstr "Submitted on !datetime"
+
+msgid "Comments"
+msgstr "Comments"
+
+msgid "Opinion"
+msgstr "Opinion"
+
+msgid "More"
+msgstr "More"
+
+msgid "Tasks"
+msgstr "Tasks"
+
+msgid "Generic"
+msgstr "Generic"
+
+msgid "Work"
+msgstr "Work"
+
+msgid "School"
+msgstr "School"
+
+msgid "Presets"
+msgstr "Presets"
+
+msgid "Standard"
+msgstr "Standard"
+
+msgid "Maximum"
+msgstr "Maximum"
+
+msgid "Green"
+msgstr "Green"
+
+msgid "Minimum"
+msgstr "Minimum"
+
+msgid "Custom"
+msgstr "Custom"
+
+msgid "Update preset"
+msgstr "Update preset"
+
+msgid "Advanced settings"
+msgstr "Advanced settings"
+
+msgid "Processor usage"
+msgstr "Processor usage"
+
+msgid "Run while computer is on battery power?"
+msgstr "Run while computer is on battery power?"
+
+msgid "Only applies to portable computers"
+msgstr "Only applies to portable computers"
+
+msgid "Run while computer is in use?"
+msgstr "Run while computer is in use?"
+
+msgid "Run GPU work while computer is in use?"
+msgstr "Run GPU work while computer is in use?"
+
+msgid "Enforced by version @number"
+msgstr "Enforced by version @number"
+
+msgid "\"In use\" means mouse/keyboard activity in last"
+msgstr "\"In use\" means mouse/keyboard activity in last"
+
+msgid "minutes"
+msgstr "minutes"
+
+msgid "Suspend work if no mouse/keyboard activity in last"
+msgstr "Suspend work if no mouse/keyboard activity in last"
+
+msgid "Needed to enter low-power mode on some computers"
+msgstr "Needed to enter low-power mode on some computers"
+
+msgid "Suspend work if CPU usage is above"
+msgstr "Suspend work if CPU usage is above"
+
+msgid "0 means no restriction. Enforced by version @number"
+msgstr "0 means no restriction. Enforced by version @number"
+
+msgid "Do work only between the hours of:"
+msgstr "Do work only between the hours of:"
+
+msgid "and"
+msgstr "and"
+
+msgid "No restriction if equal"
+msgstr "No restriction if equal"
+
+msgid "Leave tasks in memory while suspended?"
+msgstr "Leave tasks in memory while suspended?"
+
+msgid "Suspended tasks will consume swap space if \"yes\""
+msgstr "Suspended tasks will consume swap space if \"yes\""
+
+msgid "Switch between tasks every"
+msgstr "Switch between tasks every"
+
+msgid "Recommended: @period minutes"
+msgstr "Recommended: @period minutes"
+
+msgid "On multiprocessors, use at most"
+msgstr "On multiprocessors, use at most"
+
+msgid "processors"
+msgstr "processors"
+
+msgid "Set to 0 for no limit"
+msgstr "Set to 0 for no limit"
+
+msgid "% of the processors"
+msgstr "% of the processors"
+
+msgid "Use at most"
+msgstr "Use at most"
+
+msgid "% of the CPU time"
+msgstr "% of the CPU time"
+
+msgid "Can be used to reduce CPU heat"
+msgstr "Can be used to reduce CPU heat"
+
+msgid "Disk and memory usage"
+msgstr "Disk and memory usage"
+
+msgid "Disk: use at most"
+msgstr "Disk: use at most"
+
+msgid "Disk: leave free at least"
+msgstr "Disk: leave free at least"
+
+msgid "Values smaller than @number are ignored"
+msgstr "Values smaller than @number are ignored"
+
+msgid "% of total"
+msgstr "% of total"
+
+msgid "Tasks checkpoint to disk at most every"
+msgstr "Tasks checkpoint to disk at most every"
+
+msgid "seconds"
+msgstr "seconds"
+
+msgid "Swap space: use at most"
+msgstr "Swap space: use at most"
+
+msgid "Memory: when computer is in use, use at most"
+msgstr "Memory: when computer is in use, use at most"
+
+msgid "Memory: when computer is not in use, use at most"
+msgstr "Memory: when computer is not in use, use at most"
+
+msgid "Network usage"
+msgstr "Network usage"
+
+msgid "Computer is connected to the Internet about every"
+msgstr "Computer is connected to the Internet about every"
+
+msgid "days"
+msgstr "days"
+
+msgid ""
+"Leave blank or 0 if always connected. @project will try to maintain at least"
+" this much work."
+msgstr "Leave blank or 0 if always connected. @project will try to maintain at least this much work."
+
+msgid "Maintain enough work for an additional"
+msgstr "Maintain enough work for an additional"
+
+msgid "Confirm before connecting to Internet?"
+msgstr "Confirm before connecting to Internet?"
+
+msgid "Matters only if you have a modem, ISDN, or VPN connection"
+msgstr "Matters only if you have a modem, ISDN, or VPN connection"
+
+msgid "Disconnect when done?"
+msgstr "Disconnect when done?"
+
+msgid "Maximum download rate"
+msgstr "Maximum download rate"
+
+msgid "Maximum upload rate"
+msgstr "Maximum upload rate"
+
+msgid "Use network only between the hours of:"
+msgstr "Use network only between the hours of:"
+
+msgid "Transfer at most"
+msgstr "Transfer at most"
+
+msgid "Skip image file verification?"
+msgstr "Skip image file verification?"
+
+msgid ""
+"Check this ONLY if your Internet provider modifies image files (UMTS does "
+"this, for example). Skipping verification reduces the security of BOINC."
+msgstr "Check this ONLY if your Internet provider modifies image files (UMTS does this, for example). Skipping verification reduces the security of BOINC."
+
+msgid "Show comparison view"
+msgstr "Show comparison view"
+
+msgid "Resource settings"
+msgstr "Resource settings"
+
+msgid "Resource share"
+msgstr "Resource share"
+
+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 "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."
+
+msgid "Use CPU"
+msgstr "Use CPU"
+
+msgid "Use NVIDIA GPU"
+msgstr "Use NVIDIA GPU"
+
+msgid "Use ATI GPU"
+msgstr "Use ATI GPU"
+
+msgid "Use INTEL GPU"
+msgstr "Use INTEL GPU"
+
+msgid "Beta settings"
+msgstr "Beta settings"
+
+msgid "Run test applications?"
+msgstr "Run test applications?"
+
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "This helps us develop applications, but may cause jobs to fail on your computer"
+
+msgid "Default set"
+msgstr "Default set"
+
+msgid "Set used for new computers"
+msgstr "Set used for new computers"
+
+msgid "Merge"
+msgstr "Merge"
+
+msgid "Delete"
+msgstr "Delete"
+
+msgid ""
+"This will delete host @id from your account forever. Are you sure this is "
+"OK?"
+msgstr "This will delete host @id from your account forever. Are you sure this is OK?"
+
+msgid "Mark all topics read"
+msgstr "Mark all topics read"
+
+msgid "Mark all forums read"
+msgstr "Mark all forums read"
+
+msgid ""
+"CAPTCHA validation error: unknown CAPTCHA session ID. Contact the site "
+"administrator if this problem persists."
+msgstr "CAPTCHA validation error: unknown CAPTCHA session ID. Contact the site administrator if this problem persists."
+
+msgid "The answer you entered for the CAPTCHA was not correct."
+msgstr "The answer you entered for the CAPTCHA was not correct."
+
+msgid "Access denied. You must login to view this page."
+msgstr "Access denied. You must login to view this page."
+
+msgid "You are not authorized to access this page."
+msgstr "You are not authorized to access this page."
+
+msgid "Disable rich-text"
+msgstr "Disable rich-text"
+
+msgid "Enable rich-text"
+msgstr "Enable rich-text"
+
+msgid "View user profile."
+msgstr "View user profile."
+
+msgid "BBcode help"
+msgstr "BBcode help"
+
+msgid "Post comment"
+msgstr "Post comment"
+
+msgid "No @type tasks"
+msgstr "No @type tasks"
+
+msgid "There are no tasks of this type on record"
+msgstr "There are no tasks of this type on record"
+
+msgid "Clear"
+msgstr "Clear"
+
+msgid ""
+"This will remove all of your settings from the @name preference set. Are you"
+" sure?"
+msgstr "This will remove all of your settings from the @name preference set. Are you sure?"
+
+msgid "These apply to all BOINC projects in which you participate."
+msgstr "These apply to all BOINC projects in which you participate."
+
+msgid ""
+"On computers attached to multiple projects, the most recently modified "
+"preferences will be used."
+msgstr "On computers attached to multiple projects, the most recently modified preferences will be used."
+
+msgid "Preferences last modified: @mod_time"
+msgstr "Preferences last modified: @mod_time"
+
+msgid "Combined preferences"
+msgstr "Combined preferences"
+
+msgid "Switch View"
+msgstr "Switch View"
+
+msgid "every"
+msgstr "every"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid ""
+"This will remove all of your settings from the \"@name\" preference set. Are"
+" you sure?"
+msgstr "This will remove all of your settings from the \"@name\" preference set. Are you sure?"
+
+msgid "Add"
+msgstr "Add"
+
+msgid "General settings"
+msgstr "General settings"
+
+msgid "Time zone"
+msgstr "Time zone"
+
+msgid "Notification settings"
+msgstr "Notification settings"
+
+msgid "Receive email notification for private messages?"
+msgstr "Receive email notification for private messages?"
+
+msgid "Receive email notification for friend requests?"
+msgstr "Receive email notification for friend requests?"
+
+msgid "Language settings"
+msgstr "Language settings"
+
+msgid ""
+"This account's default language for e-mails and preferred language for site "
+"presentation."
+msgstr "This account's default language for e-mails and preferred language for site presentation."
+
+msgid "Avatar settings"
+msgstr "Avatar settings"
+
+msgid "Create a profile"
+msgstr "Create a profile"
+
+msgid "Upload an avatar"
+msgstr "Upload an avatar"
+
+msgid "Forum settings"
+msgstr "Forum settings"
+
+msgid "In discussion topics, show at most @comments_per_page"
+msgstr "In discussion topics, show at most @comments_per_page"
+
+msgid "comments per page"
+msgstr "comments per page"
+
+msgid "Sort comments in discussions"
+msgstr "Sort comments in discussions"
+
+msgid "Newest post first"
+msgstr "Newest post first"
+
+msgid "Oldest post first"
+msgstr "Oldest post first"
+
+msgid "Signature"
+msgstr "Signature"
+
+msgid "Your signature will be publicly displayed at the end of your comments."
+msgstr "Your signature will be publicly displayed at the end of your comments."
+
+msgid "Hide signatures in forums"
+msgstr "Hide signatures in forums"
+
+msgid "Privacy settings"
+msgstr "Privacy settings"
+
+msgid "Is it OK for @project and your team (if any) to email you?"
+msgstr "Is it OK for @project and your team (if any) to email you?"
+
+msgid "Hide"
+msgstr "Hide"
+
+msgid "Hide this topic"
+msgstr "Hide this topic"
+
+msgid "Lock"
+msgstr "Lock"
+
+msgid "Lock this thread for comments"
+msgstr "Lock this thread for comments"
+
+msgid "Make sticky"
+msgstr "Make sticky"
+
+msgid "Make this topic sticky"
+msgstr "Make this topic sticky"
+
+msgid "moderation"
+msgstr "moderation"
+
+msgid "Post new comment"
+msgstr "Post new comment"
+
+msgid "You must earn 1 more credit!"
+msgstr "You must earn 1 more credit!"
+
+msgid "Joined"
+msgstr "Joined"
+
+msgid "Credit"
+msgstr "Credit"
+
+msgid "RAC"
+msgstr "RAC"
+
+msgid "Join team"
+msgstr "Join team"
+
+msgid "Click here to become a member of @this_team"
+msgstr "Click here to become a member of @this_team"
+
+msgid "Join this team"
+msgstr "Join this team"
+
+msgid "Manage team"
+msgstr "Manage team"
+
+msgid "View member list"
+msgstr "View member list"
+
+msgid "Member names and emails"
+msgstr "Member names and emails"
+
+msgid "View change history"
+msgstr "View change history"
+
+msgid "See member activity"
+msgstr "See member activity"
+
+msgid "Manage team message board"
+msgstr "Manage team message board"
+
+msgid "Create or manage message board"
+msgstr "Create or manage message board"
+
+msgid "Remove members"
+msgstr "Remove members"
+
+msgid "Change founder"
+msgstr "Change founder"
+
+msgid "Manage team admins"
+msgstr "Manage team admins"
+
+msgid "Edit team info"
+msgstr "Edit team info"
+
+msgid "Remove team"
+msgstr "Remove team"
+
+msgid "Team forum"
+msgstr "Team forum"
+
+msgid "A discussion forum has been set up for team members."
+msgstr "A discussion forum has been set up for team members."
+
+msgid "Enter forum"
+msgstr "Enter forum"
+
+msgid "Leave team"
+msgstr "Leave team"
+
+msgid "Leave this team"
+msgstr "Leave this team"
+
+msgid "Edit message board"
+msgstr "Edit message board"
+
+msgid "Message board title"
+msgstr "Message board title"
+
+msgid "Text only, no HTML tags"
+msgstr "Text only, no HTML tags"
+
+msgid "Minimum time between posts"
+msgstr "Minimum time between posts"
+
+msgid "Seconds"
+msgstr "Seconds"
+
+msgid "Minimum total credit to post"
+msgstr "Minimum total credit to post"
+
+msgid "Allow public to read board?"
+msgstr "Allow public to read board?"
+
+msgid "Save message board"
+msgstr "Save message board"
+
+msgid "About message boards"
+msgstr "About message boards"
+
+msgid "This is a team-only message board"
+msgstr "This is a team-only message board"
+
+msgid "Only members may post"
+msgstr "Only members may post"
+
+msgid "Only members may read (optional)"
+msgstr "Only members may read (optional)"
+
+msgid "Changing the team founder"
+msgstr "Changing the team founder"
+
+msgid "Any member of the team is eligible"
+msgstr "Any member of the team is eligible"
+
+msgid "Current founder becomes a normal user"
+msgstr "Current founder becomes a normal user"
+
+msgid "It must be 60 days since any previous request"
+msgstr "It must be 60 days since any previous request"
+
+msgid "Add team admin"
+msgstr "Add team admin"
+
+msgid "Enter email address"
+msgstr "Enter email address"
+
+msgid "Current team admins"
+msgstr "Current team admins"
+
+msgid "About team admins"
+msgstr "About team admins"
+
+msgid "Team admins can:"
+msgstr "Team admins can:"
+
+msgid "Edit team information"
+msgstr "Edit team information"
+
+msgid "View the team's join / quit history"
+msgstr "View the team's join / quit history"
+
+msgid "Moderate the team forum"
+msgstr "Moderate the team forum"
+
+msgid "Remove members from the team"
+msgstr "Remove members from the team"
+
+msgid "Disband a team if it has no members"
+msgstr "Disband a team if it has no members"
+
+msgid "Team admins cannot:"
+msgstr "Team admins cannot:"
+
+msgid "Change the team founder"
+msgstr "Change the team founder"
+
+msgid "Add / Remove team admins"
+msgstr "Add / Remove team admins"
+
+msgid "Choose type"
+msgstr "Choose type"
+
+msgid "Team name"
+msgstr "Team name"
+
+msgid "Team name -- HTML version (optional)"
+msgstr "Team name -- HTML version (optional)"
+
+msgid "You may use limited HTML tags"
+msgstr "You may use limited HTML tags"
+
+msgid "Team website (optional)"
+msgstr "Team website (optional)"
+
+msgid "Displayed on the team's page"
+msgstr "Displayed on the team's page"
+
+msgid "Type of team"
+msgstr "Type of team"
+
+msgid "Accept new members?"
+msgstr "Accept new members?"
+
+msgid "Description of team"
+msgstr "Description of team"
+
+msgid "Create new team"
+msgstr "Create new team"
+
+msgid "Create a team"
+msgstr "Create a team"
+
+msgid "Save team"
+msgstr "Save team"
+
+msgid "Create team message board"
+msgstr "Create team message board"
+
+msgid "Create message board"
+msgstr "Create message board"
+
+msgid ""
+"Please set the minimum average credit that a user is required to have in "
+"order to post to this message board."
+msgstr "Please set the minimum average credit that a user is required to have in order to post to this message board."
+
+msgid "Post new topic"
+msgstr "Post new topic"
+
+msgid "Anonymous"
+msgstr "Anonymous"
+
+msgid "Unpublished"
+msgstr "Unpublished"
+
+msgid "Sorry, unrecognized email address or password."
+msgstr "Sorry, unrecognized email address or password."
+
+msgid "Have you forgotten your password?"
+msgstr "Have you forgotten your password?"
+
+msgid "Id"
+msgstr "Id"
+
+msgid "Recent average credit"
+msgstr "Recent average credit"
+
+msgid "Members"
+msgstr "Members"
+
+msgid "Total Credit"
+msgstr "Total Credit"
+
+msgid "User ID"
+msgstr "User ID"
+
+msgid "User"
+msgstr "User"
+
+msgid "Admin since"
+msgstr "Admin since"
+
+msgid "Team ID"
+msgstr "Team ID"
+
+msgid "User joined"
+msgstr "User joined"
+
+msgid "Timestamp"
+msgstr "Timestamp"
+
+msgid "Account Key"
+msgstr "Account Key"
+
+msgid "CPID"
+msgstr "CPID"
+
+msgid "Email Address"
+msgstr "Email Address"
+
+msgid "Password Hash"
+msgstr "Password Hash"
+
+msgid "Postal Code"
+msgstr "Postal Code"
+
+msgid "Send Email"
+msgstr "Send Email"
+
+msgid "Show Hosts"
+msgstr "Show Hosts"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Computer ID"
+msgstr "Computer ID"
+
+msgid "Location"
+msgstr "Location"
+
+msgid "While BOINC running, % of time work is allowed"
+msgstr "While BOINC running, % of time work is allowed"
+
+msgid "Average turnaround time"
+msgstr "Average turnaround time"
+
+msgid "Created"
+msgstr "Created"
+
+msgid "While BOINC running, % of time host has an Internet connection"
+msgstr "While BOINC running, % of time host has an Internet connection"
+
+msgid "Average CPU efficiency"
+msgstr "Average CPU efficiency"
+
+msgid "Free disk space"
+msgstr "Free disk space"
+
+msgid "Total disk space"
+msgstr "Total disk space"
+
+msgid "Task duration correction factor"
+msgstr "Task duration correction factor"
+
+msgid "Avg. credit"
+msgstr "Avg. credit"
+
+msgid "External IP address"
+msgstr "External IP address"
+
+msgid "Cross project ID"
+msgstr "Cross project ID"
+
+msgid "Last IP address"
+msgstr "Last IP address"
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "Memory"
+msgstr "Memory"
+
+msgid "Swap space"
+msgstr "Swap space"
+
+msgid "Average download rate"
+msgstr "Average download rate"
+
+msgid "Average upload rate"
+msgstr "Average upload rate"
+
+msgid "Same IP address count"
+msgstr "Same IP address count"
+
+msgid "% of time BOINC client is running"
+msgstr "% of time BOINC client is running"
+
+msgid "Operating system"
+msgstr "Operating system"
+
+msgid "Operating system version"
+msgstr "Operating system version"
+
+msgid "Measured floating point speed"
+msgstr "Measured floating point speed"
+
+msgid "Measured integer speed"
+msgstr "Measured integer speed"
+
+msgid "CPU model"
+msgstr "CPU model"
+
+msgid "Number of processors"
+msgstr "Number of processors"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Number of times client has contacted server"
+msgstr "Number of times client has contacted server"
+
+msgid "Last contact"
+msgstr "Last contact"
+
+msgid "Serial number"
+msgstr "Serial number"
+
+msgid "Timezone"
+msgstr "Timezone"
+
+msgid "Platform ID"
+msgstr "Platform ID"
+
+msgid "Task ID"
+msgstr "Task ID"
+
+msgid "Workunit ID"
+msgstr "Workunit ID"
+
+msgid "Host ID"
+msgstr "Host ID"
+
+msgid "Application ID"
+msgstr "Application ID"
+
+msgid "Application version"
+msgstr "Application version"
+
+msgid "Claimed credit"
+msgstr "Claimed credit"
+
+msgid "Client state"
+msgstr "Client state"
+
+msgid "CPU time"
+msgstr "CPU time"
+
+msgid "Run time"
+msgstr "Run time"
+
+msgid "Exit status"
+msgstr "Exit status"
+
+msgid "Granted credit"
+msgstr "Granted credit"
+
+msgid "Outcome"
+msgstr "Outcome"
+
+msgid "Report deadline"
+msgstr "Report deadline"
+
+msgid "Sent"
+msgstr "Sent"
+
+msgid "Server state"
+msgstr "Server state"
+
+msgid "Stderr out"
+msgstr "Stderr out"
+
+msgid "Validation state"
+msgstr "Validation state"
+
+msgid "Canonical credit"
+msgstr "Canonical credit"
+
+msgid "Canonical result ID"
+msgstr "Canonical result ID"
+
+msgid "Created time"
+msgstr "Created time"
+
+msgid "Needs validation"
+msgstr "Needs validation"
+
+msgid "Initial replication"
+msgstr "Initial replication"
+
+msgid "Computer"
+msgstr "Computer"
+
+msgid "Consecutive valid tasks"
+msgstr "Consecutive valid tasks"
+
+msgid "Number of tasks completed"
+msgstr "Number of tasks completed"
+
+msgid "Max tasks per day"
+msgstr "Max tasks per day"
+
+msgid "Number of tasks today"
+msgstr "Number of tasks today"
+
+msgid "Show IP address"
+msgstr "Show IP address"
+
+msgid "hours"
+msgstr "hours"
+
+msgid "Remove friend"
+msgstr "Remove friend"
+
+msgid "Ban user"
+msgstr "Ban user"
+
+msgid "Add as friend"
+msgstr "Add as friend"
+
+msgid "Team"
+msgstr "Team"
+
+msgid "Reply"
+msgstr "Reply"
+
+msgid "Reply to this comment"
+msgstr "Reply to this comment"
+
+msgid "Quote"
+msgstr "Quote"
+
+msgid "Reply to this comment with quote"
+msgstr "Reply to this comment with quote"
+
+msgid "Edit this comment"
+msgstr "Edit this comment"
+
+msgid "Delete this comment"
+msgstr "Delete this comment"
+
+msgid "Hide this comment"
+msgstr "Hide this comment"
+
+msgid "Convert"
+msgstr "Convert"
+
+msgid "Convert this comment to a new topic"
+msgstr "Convert this comment to a new topic"
+
+msgid "Details"
+msgstr "Details"
+
+msgid "Make unsticky"
+msgstr "Make unsticky"
+
+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 "Sometimes BOINC assigns separate identities to the same computer by mistake. You can correct this by merging old identities with the newest one."
+
+msgid "Remove"
+msgstr "Remove"
+
+msgid "hidden"
+msgstr "hidden"
diff --git a/locale/en/BOINC-Manager.mo b/locale/en/BOINC-Manager.mo
index 0a134bb..71878ee 100644
Binary files a/locale/en/BOINC-Manager.mo and b/locale/en/BOINC-Manager.mo differ
diff --git a/locale/en/BOINC-Manager.po b/locale/en/BOINC-Manager.po
index ae93b19..cba4553 100644
--- a/locale/en/BOINC-Manager.po
+++ b/locale/en/BOINC-Manager.po
@@ -7,8 +7,8 @@ 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-03-24 17:39+0000\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-01 21:11+0000\n"
 "Last-Translator: Rom Walton\n"
 "Language-Team: English (http://www.transifex.com/projects/p/boinc/language/en/)\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en\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
@@ -174,6 +174,8 @@ msgstr "Open web page"
 msgid "Visit this account manager's web site"
 msgstr "Visit this account manager's web site"
 
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
 #: clientgui/AccountManagerProcessingPage.cpp:186
 #: clientgui/AccountManagerPropertiesPage.cpp:192
 #, c-format
@@ -202,364 +204,369 @@ msgstr "Connected"
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: clientgui/AdvancedFrame.cpp:325
+#: clientgui/AdvancedFrame.cpp:327
 #, c-format
 msgid "New %s window..."
 msgstr "New %s window..."
 
-#: clientgui/AdvancedFrame.cpp:329
+#: clientgui/AdvancedFrame.cpp:331
 #, c-format
 msgid "Open another %s window"
 msgstr "Open another %s window"
 
-#: clientgui/AdvancedFrame.cpp:340
+#: clientgui/AdvancedFrame.cpp:342
 msgid "Select computer..."
 msgstr "Select computer..."
 
-#: clientgui/AdvancedFrame.cpp:341
+#: clientgui/AdvancedFrame.cpp:343
 msgid "Connect to a BOINC client on another computer"
 msgstr "Connect to a BOINC client on another computer"
 
-#: clientgui/AdvancedFrame.cpp:345
+#: clientgui/AdvancedFrame.cpp:347
 msgid "Shut down connected client..."
 msgstr "Shut down connected client..."
 
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:348
 msgid "Shut down the currently connected BOINC client"
 msgstr "Shut down the currently connected BOINC client"
 
-#: clientgui/AdvancedFrame.cpp:351
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
 #, c-format
 msgid "Close the %s window"
 msgstr "Close the %s window"
 
-#: clientgui/AdvancedFrame.cpp:354
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
 msgid "&Close window"
 msgstr "&Close window"
 
-#: 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 "Exit %s"
 
-#: clientgui/AdvancedFrame.cpp:386
-msgid "Preferences…"
-msgstr "Preferences…"
+#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+msgid "Preferences..."
+msgstr "Preferences..."
 
-#: clientgui/AdvancedFrame.cpp:395
+#: clientgui/AdvancedFrame.cpp:398
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Notices\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:396
+#: clientgui/AdvancedFrame.cpp:399
 msgid "Show notices"
 msgstr "Show notices"
 
-#: clientgui/AdvancedFrame.cpp:401
+#: clientgui/AdvancedFrame.cpp:404
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projects\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:402
+#: clientgui/AdvancedFrame.cpp:405
 msgid "Show projects"
 msgstr "Show projects"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: clientgui/AdvancedFrame.cpp:410
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Tasks\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:408
+#: clientgui/AdvancedFrame.cpp:411
 msgid "Show tasks"
 msgstr "Show tasks"
 
-#: clientgui/AdvancedFrame.cpp:413
+#: clientgui/AdvancedFrame.cpp:416
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Trans&fers\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:414
+#: clientgui/AdvancedFrame.cpp:417
 msgid "Show file transfers"
 msgstr "Show file transfers"
 
-#: clientgui/AdvancedFrame.cpp:419
+#: clientgui/AdvancedFrame.cpp:422
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistics\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:420
+#: clientgui/AdvancedFrame.cpp:423
 msgid "Show statistics"
 msgstr "Show statistics"
 
-#: clientgui/AdvancedFrame.cpp:425
+#: clientgui/AdvancedFrame.cpp:428
 msgid "&Disk\tCtrl+Shift+D"
 msgstr "&Disk\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:429
 msgid "Show disk usage"
 msgstr "Show disk usage"
 
-#: clientgui/AdvancedFrame.cpp:432
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Event Log...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:433
-msgid "Show diagnostic messages"
-msgstr "Show diagnostic messages"
-
-#: clientgui/AdvancedFrame.cpp:439
+#: clientgui/AdvancedFrame.cpp:436
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Simple &View...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:437
 msgid "Switch to the Simple View"
 msgstr "Switch to the Simple View"
 
-#: clientgui/AdvancedFrame.cpp:454
-msgid "&Add project or account manager..."
-msgstr "&Add project or account manager..."
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
+msgstr "&Add project..."
+
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "Add a project"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "&Use account manager..."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "Add a new science project, or use an account manager"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "Use an account manager to control this computer."
 
-#: clientgui/AdvancedFrame.cpp:459
+#: clientgui/AdvancedFrame.cpp:461
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synchronize with %s"
 
-#: clientgui/AdvancedFrame.cpp:463
+#: clientgui/AdvancedFrame.cpp:465
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Get current settings from %s"
 
-#: clientgui/AdvancedFrame.cpp:473
-msgid "&Add project..."
-msgstr "&Add project..."
-
-#: clientgui/AdvancedFrame.cpp:474
-msgid "Add a project"
-msgstr "Add a project"
-
-#: clientgui/AdvancedFrame.cpp:477
+#: clientgui/AdvancedFrame.cpp:479
 #, c-format
 msgid "S&top using %s..."
 msgstr "S&top using %s..."
 
-#: clientgui/AdvancedFrame.cpp:483
+#: clientgui/AdvancedFrame.cpp:485
 msgid "Remove this computer from account manager control."
 msgstr "Remove this computer from account manager control."
 
-#: clientgui/AdvancedFrame.cpp:489
+#: clientgui/AdvancedFrame.cpp:491
 msgid "Run CPU &benchmarks"
 msgstr "Run CPU &benchmarks"
 
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:492
 msgid "Run tests that measure CPU speed"
 msgstr "Run tests that measure CPU speed"
 
-#: clientgui/AdvancedFrame.cpp:494
+#: clientgui/AdvancedFrame.cpp:496
 msgid "Retry pending transfers"
 msgstr "Retry pending transfers"
 
-#: clientgui/AdvancedFrame.cpp:495
+#: clientgui/AdvancedFrame.cpp:497
 msgid "Retry deferred file transfers and task requests"
 msgstr "Retry deferred file transfers and task requests"
 
+#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "Event Log...\tCtrl+Shift+E"
+
 #: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr "Show diagnostic messages"
+
+#: clientgui/AdvancedFrame.cpp:511
 msgid "&Run always"
 msgstr "&Run always"
 
-#: clientgui/AdvancedFrame.cpp:504
+#: clientgui/AdvancedFrame.cpp:512
 msgid "Allow work regardless of preferences"
 msgstr "Allow work regardless of preferences"
 
-#: clientgui/AdvancedFrame.cpp:508
+#: clientgui/AdvancedFrame.cpp:516
 msgid "Run based on &preferences"
 msgstr "Run based on &preferences"
 
-#: clientgui/AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:517
 msgid "Allow work according to preferences"
 msgstr "Allow work according to preferences"
 
-#: clientgui/AdvancedFrame.cpp:513
+#: clientgui/AdvancedFrame.cpp:521
 msgid "&Suspend"
 msgstr "&Suspend"
 
-#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/AdvancedFrame.cpp:522
 msgid "Stop work regardless of preferences"
 msgstr "Stop work regardless of preferences"
 
-#: clientgui/AdvancedFrame.cpp:539
+#: clientgui/AdvancedFrame.cpp:547
 msgid "Use GPU always"
 msgstr "Use GPU always"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:548
 msgid "Allow GPU work regardless of preferences"
 msgstr "Allow GPU work regardless of preferences"
 
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:552
 msgid "Use GPU based on preferences"
 msgstr "Use GPU based on preferences"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:553
 msgid "Allow GPU work according to preferences"
 msgstr "Allow GPU work according to preferences"
 
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:557
 msgid "Suspend GPU"
 msgstr "Suspend GPU"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:558
 msgid "Stop GPU work regardless of preferences"
 msgstr "Stop GPU work regardless of preferences"
 
-#: clientgui/AdvancedFrame.cpp:574
+#: clientgui/AdvancedFrame.cpp:582
 msgid "Network activity always allowed"
 msgstr "Network activity always allowed"
 
-#: clientgui/AdvancedFrame.cpp:575
+#: clientgui/AdvancedFrame.cpp:583
 msgid "Allow network activity regardless of preferences"
 msgstr "Allow network activity regardless of preferences"
 
-#: clientgui/AdvancedFrame.cpp:579
+#: clientgui/AdvancedFrame.cpp:587
 msgid "Network activity based on preferences"
 msgstr "Network activity based on preferences"
 
-#: clientgui/AdvancedFrame.cpp:580
+#: clientgui/AdvancedFrame.cpp:588
 msgid "Allow network activity according to preferences"
 msgstr "Allow network activity according to preferences"
 
-#: clientgui/AdvancedFrame.cpp:584
+#: clientgui/AdvancedFrame.cpp:592
 msgid "Network activity suspended"
 msgstr "Network activity suspended"
 
-#: clientgui/AdvancedFrame.cpp:585
+#: clientgui/AdvancedFrame.cpp:593
 msgid "Stop BOINC network activity"
 msgstr "Stop BOINC network activity"
 
-#: clientgui/AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
 msgid "Computing &preferences..."
 msgstr "Computing &preferences..."
 
-#: clientgui/AdvancedFrame.cpp:595
+#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
 msgid "Configure computing preferences"
 msgstr "Configure computing preferences"
 
-#: clientgui/AdvancedFrame.cpp:600
+#: clientgui/AdvancedFrame.cpp:608
 msgid "Exclusive applications..."
 msgstr "Exclusive applications..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: clientgui/AdvancedFrame.cpp:609
 msgid "Configure exclusive applications"
 msgstr "Configure exclusive applications"
 
-#: clientgui/AdvancedFrame.cpp:606
+#: clientgui/AdvancedFrame.cpp:614
 msgid "Select columns..."
 msgstr "Select columns..."
 
-#: clientgui/AdvancedFrame.cpp:607
+#: clientgui/AdvancedFrame.cpp:615
 msgid "Select which columns to display"
 msgstr "Select which columns to display"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: clientgui/AdvancedFrame.cpp:619
 msgid "Event Log options...\tCtrl+Shift+F"
 msgstr "Event Log options...\tCtrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: clientgui/AdvancedFrame.cpp:620
 msgid "Enable or disable various diagnostic messages"
 msgstr "Enable or disable various diagnostic messages"
 
-#: clientgui/AdvancedFrame.cpp:616
+#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
 msgid "&Other options..."
 msgstr "&Other options..."
 
-#: clientgui/AdvancedFrame.cpp:617
+#: clientgui/AdvancedFrame.cpp:625
 msgid "Configure display options and network settings"
 msgstr "Configure display options and network settings"
 
-#: clientgui/AdvancedFrame.cpp:622
+#: clientgui/AdvancedFrame.cpp:630
 msgid "Read config files"
 msgstr "Read config files"
 
-#: clientgui/AdvancedFrame.cpp:623
+#: clientgui/AdvancedFrame.cpp:631
 msgid ""
 "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Read configuration info from cc_config.xml and any app_config.xml files"
 
-#: clientgui/AdvancedFrame.cpp:627
+#: clientgui/AdvancedFrame.cpp:635
 msgid "Read local prefs file"
 msgstr "Read local prefs file"
 
-#: clientgui/AdvancedFrame.cpp:628
+#: clientgui/AdvancedFrame.cpp:636
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Read preferences from global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
 #, c-format
 msgid "%s &help"
 msgstr "%s &help"
 
-#: clientgui/AdvancedFrame.cpp:640
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
 #, c-format
 msgid "Show information about %s"
 msgstr "Show information about %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:658
 #, c-format
 msgid "&%s help"
 msgstr "&%s help"
 
-#: clientgui/AdvancedFrame.cpp:654
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
 msgid "Show information about the %s"
 msgstr "Show information about the %s"
 
-#: clientgui/AdvancedFrame.cpp:665
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
 #, c-format
 msgid "%s &web site"
 msgstr "%s &web site"
 
-#: clientgui/AdvancedFrame.cpp:669
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Show information about BOINC and %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 "&About %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
 msgid "Licensing and copyright information."
 msgstr "Licensing and copyright information."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
 msgid "&File"
 msgstr "&File"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr "&View"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:709
 msgid "&Activity"
 msgstr "&Activity"
 
-#: 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 "&Tools"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr "&Help"
 
-#: clientgui/AdvancedFrame.cpp:1188
+#: clientgui/AdvancedFrame.cpp:1235
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Stop using %s"
 
-#: clientgui/AdvancedFrame.cpp:1193
+#: clientgui/AdvancedFrame.cpp:1240
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -569,39 +576,39 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr "If you stop using %s,\nyou'll keep all your current projects,\nbut you'll have to manage projects manually.\n\nDo you want to stop using %s?"
 
-#: clientgui/AdvancedFrame.cpp:1420
+#: clientgui/AdvancedFrame.cpp:1469
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Shut down the current client..."
 
-#: 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 will shut down the current client\nand prompt you for another host to connect to."
 
-#: 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 has successfully added %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 "Connecting to %s"
 
-#: clientgui/AdvancedFrame.cpp:1984
+#: clientgui/AdvancedFrame.cpp:2033
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Connected to %s (%s)"
@@ -649,7 +656,9 @@ msgstr "E&xit %s"
 msgid "%s - Communication"
 msgstr "%s - Communication"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -722,6 +731,7 @@ msgid ""
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr "%s is not currently connected to a %s client.\nPlease use the 'Advanced\\Select Computer...' menu option to connect up to a %s client.\nTo connect up to your local computer please use 'localhost' as the host name."
 
+#. Create the web sites task group
 #: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Project web pages"
@@ -806,7 +816,8 @@ msgstr "%s ownership or permissions are not set properly; please reinstall %s.\n
 msgid " at "
 msgstr " at "
 
-#: clientgui/BOINCGUIApp.cpp:612
+#: clientgui/BOINCGUIApp.cpp:612 clientgui/MainDocument.cpp:2494
+#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
 msgid ")"
 msgstr ")"
 
@@ -816,7 +827,7 @@ msgid ""
 "Please reboot your computer and try again."
 msgstr "A reboot is required in order for BOINC to run properly.\nPlease reboot your computer and try again."
 
-#: clientgui/BOINCGUIApp.cpp:643
+#: clientgui/BOINCGUIApp.cpp:643 clientgui/DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
@@ -868,6 +879,7 @@ msgstr "multiple instances of BOINC Manager allowed"
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Not used: workaround for bug in XCode 4.2"
 
+#. These are just special tags so deal with them in a special way
 #: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Automatic Detection)"
@@ -890,13 +902,13 @@ msgstr "Open %s Web..."
 msgid "Open %s..."
 msgstr "Open %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 "Snooze"
 
-#: 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 "Snooze GPU"
 
@@ -904,52 +916,55 @@ msgstr "Snooze GPU"
 msgid "E&xit"
 msgstr "E&xit"
 
-#: 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 "Resume"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:649
 msgid "Resume GPU"
 msgstr "Resume GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: clientgui/BOINCTaskBar.cpp:715
 msgid "Computing is enabled"
 msgstr "Computing is enabled"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: clientgui/BOINCTaskBar.cpp:719
 msgid "Computing is suspended - "
 msgstr "Computing is suspended - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: clientgui/BOINCTaskBar.cpp:729
 msgid "GPU computing is enabled"
 msgstr "GPU computing is enabled"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:732
 msgid "GPU computing is suspended - "
 msgstr "GPU computing is suspended - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: clientgui/BOINCTaskBar.cpp:741
 msgid "Network is enabled"
 msgstr "Network is enabled"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: clientgui/BOINCTaskBar.cpp:744
 msgid "Network is suspended - "
 msgstr "Network is suspended - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: clientgui/BOINCTaskBar.cpp:752
 msgid "Reconnecting to client."
 msgstr "Reconnecting to client."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: clientgui/BOINCTaskBar.cpp:754
 msgid "Not connected to a client."
 msgstr "Not connected to a client."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: clientgui/BOINCTaskBar.cpp:807
 #, c-format
 msgid "%s Notices"
 msgstr "%s Notices"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: clientgui/BOINCTaskBar.cpp:813
 msgid "There are new notices - click to view."
 msgstr "There are new notices - click to view."
 
@@ -1008,6 +1023,7 @@ msgstr "Update from %s completed."
 msgid "Update completed."
 msgstr "Update completed."
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Now using account manager"
@@ -1054,48 +1070,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr "BOINC is distributed under the GNU Lesser General Public License v3.0."
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr "Visit "
+msgid "For more information, visit "
+msgstr "For more information, visit "
 
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
-msgstr "for more information."
-
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr "Invalid number"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:771
+msgid "Start time must be different from end time"
+msgstr "Start time must be different from end time"
+
+#: clientgui/DlgAdvPreferences.cpp:685
 msgid "Number must be between 0 and 10"
 msgstr "Number must be between 0 and 10"
 
-#: clientgui/DlgAdvPreferences.cpp:672
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:772
 msgid "Number must be between 0 and 100"
 msgstr "Number must be between 0 and 100"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "invalid input value detected"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 msgid "Validation Error"
 msgstr "Validation Error"
 
-#: clientgui/DlgAdvPreferences.cpp:1119
+#: clientgui/DlgAdvPreferences.cpp:1158
 msgid "Discard local preferences and use web-based preferences?"
 msgstr "Discard local preferences and use web-based preferences?"
 
-#: clientgui/DlgAdvPreferences.cpp:1120
+#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1171
 msgid "Confirmation"
 msgstr "Confirmation"
 
@@ -1104,106 +1120,111 @@ msgstr "Confirmation"
 msgid "%s - Computing preferences"
 msgstr "%s - Computing preferences"
 
-#: 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 "Using local preferences.\nClick \"Use web prefs\" to use web-based preferences from"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
 msgid "Using web-based preferences from"
 msgstr "Using web-based preferences from"
 
-#: 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 "Set values and click OK to use local preferences instead."
 
-#: 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 "This dialog controls preferences for this computer only.\nClick OK to set preferences.\nClick Clear to restore web-based settings."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: clientgui/DlgAdvPreferencesBase.cpp:119
 msgid "Clear"
 msgstr "Clear"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:115
+#: clientgui/DlgAdvPreferencesBase.cpp:120
 msgid "Clear all local preferences and close the dialog."
 msgstr "Clear all local preferences and close the dialog."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
+#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:215
 msgid "Use web prefs"
 msgstr "Use web prefs"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 msgid "Restore web-based preferences and close the dialog."
 msgstr "Restore web-based preferences and close the dialog."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:143
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#. Computing schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:148
+#: clientgui/DlgAdvPreferencesBase.cpp:688
 msgid "Computing"
 msgstr "Computing"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 msgid "Network"
 msgstr "Network"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
+#: clientgui/DlgAdvPreferencesBase.cpp:154
 msgid "Disk and memory"
 msgstr "Disk and memory"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:152
+#: clientgui/DlgAdvPreferencesBase.cpp:157
 msgid "Daily schedules"
 msgstr "Daily schedules"
 
-#: 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:347
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:166
+#: clientgui/DlgAdvPreferencesBase.cpp:171
 msgid "Save all values and close the dialog."
 msgstr "Save all values and close the dialog."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:172
+#: clientgui/DlgAdvPreferencesBase.cpp:177
 msgid "Close the dialog without saving."
 msgstr "Close the dialog without saving."
 
-#: 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:357
 msgid "Help"
 msgstr "Help"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:182
 msgid "Shows the preferences web page."
 msgstr "Shows the preferences web page."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:239
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:471
 msgid "Usage limits"
 msgstr "Usage limits"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, no-c-format
 msgid ""
 "Keep some CPUs free for other applications. Example: 75% means use 6 cores "
 "on an 8-core CPU."
 msgstr "Keep some CPUs free for other applications. Example: 75% means use 6 cores on an 8-core CPU."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr "Use at most"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% of the CPUs"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1211,342 +1232,355 @@ msgid ""
 "and repeat."
 msgstr "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."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% of CPU time"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr "When to suspend"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr "Suspend when computer is on battery"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "Check this to suspend computing on portables when running on battery power."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr "Suspend when computer is in use"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "Check this to suspend computing and file transfers when you're using the computer."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
 msgstr "Suspend GPU computing when computer is in use"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr "Check this to suspend GPU computing when you're using the computer."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr "This determines when the computer is considered 'in use'."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "'In use' means mouse/keyboard input in last"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "minutes"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "Suspend when non-%s CPU usage is above"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Suspend when non-BOINC CPU usage is above"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "Suspend computing when your computer is busy running other programs."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr "Other"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "Store at least enough tasks to keep the computer busy for this long."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr "Store at least"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr "days of work"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:384
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
 msgstr "Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
 msgstr "Store up to an additional"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "If you run several projects, %s may switch between them this often."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr "Switch between tasks every"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:427
 msgid ""
 "This controls how often tasks save their state to disk, so that they can be "
 "restarted later."
 msgstr "This controls how often tasks save their state to disk, so that they can be restarted later."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
 msgstr "Request tasks to checkpoint at most every"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr "seconds"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr "Limit the download rate of file transfers."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr "Limit download rate to"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr "KB/second"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
 msgstr "Limit the upload rate of file transfers."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr "Limit upload rate to"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr "Example: %s should transfer at most 2000 MB of data every 30 days."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "Limit usage to"
 msgstr "Limit usage to"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr "MB every"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr "days"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, c-format
 msgid ""
 "Check this only if your Internet provider modifies image files. Skipping "
 "verification reduces the security of %s."
 msgstr "Check this only if your Internet provider modifies image files. Skipping verification reduces the security of %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Skip data verification for image files"
 msgstr "Skip data verification for image files"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
 msgstr "Confirm before connecting to Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr "Useful only if you have a modem, ISDN or VPN connection."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
 msgstr "Disconnect when done"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "Disk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%s will use the most restrictive of these settings:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, c-format
 msgid "Limit the total amount of disk space used by %s."
 msgstr "Limit the total amount of disk space used by %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:530
-#: clientgui/DlgAdvPreferencesBase.cpp:554
+#: clientgui/DlgAdvPreferencesBase.cpp:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr "Use no more than"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, c-format
 msgid ""
 "Limit disk usage to leave this much free space on the volume where %s stores"
 " data."
 msgstr "Limit disk usage to leave this much free space on the volume where %s stores data."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:542
+#: clientgui/DlgAdvPreferencesBase.cpp:593
 msgid "Leave at least"
 msgstr "Leave at least"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr "GB free"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, c-format
 msgid ""
 "Limit the percentage of disk space used by %s on the volume where it stores "
 "data."
 msgstr "Limit the percentage of disk space used by %s on the volume where it stores data."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: clientgui/DlgAdvPreferencesBase.cpp:610
 #, no-c-format
 msgid "% of total"
 msgstr "% of total"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr "Memory"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "Limit the memory used by %s when you're using the computer."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 msgid "When computer is in use, use at most"
 msgstr "When computer is in use, use at most"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:579
-#: clientgui/DlgAdvPreferencesBase.cpp:591
-#: clientgui/DlgAdvPreferencesBase.cpp:607
+#: clientgui/DlgAdvPreferencesBase.cpp:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, c-format
 msgid "Limit the memory used by %s when you're not using the computer."
 msgstr "Limit the memory used by %s when you're not using the computer."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:586
+#: clientgui/DlgAdvPreferencesBase.cpp:637
 msgid "When computer is not in use, use at most"
 msgstr "When computer is not in use, use at most"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "Leave non-GPU tasks in memory while suspended"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:647
 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 "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:600
+#: clientgui/DlgAdvPreferencesBase.cpp:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "Limit the swap space (page file) used by %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr "Page/swap file: use at most"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr "and"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr "to"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
 msgstr "Compute only during a particular period each day."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr "Compute only between"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
 msgstr "Day-of-week override"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr "Override the times above on the selected days:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr "Monday"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr "Friday"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr "Saturday"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr "Sunday"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr "Thursday"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr "Transfer files only during a particular period each day."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr "Transfer files only between"
 
@@ -1585,15 +1619,19 @@ msgstr "Close the dialog without saving"
 msgid "%s - Event Log"
 msgstr "%s - Event Log"
 
-#: 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 "Project"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
 msgid "Time"
 msgstr "Time"
 
-#: clientgui/DlgEventLog.cpp:239
+#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
 msgid "Message"
 msgstr "Message"
 
@@ -1606,6 +1644,7 @@ msgid "Copy &All"
 msgstr "Copy &All"
 
 #: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Copy all the messages to the clipboard."
 
@@ -1614,6 +1653,7 @@ msgid "Copy &Selected"
 msgstr "Copy &Selected"
 
 #: 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 "
@@ -1621,6 +1661,7 @@ msgid ""
 msgstr "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: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 "
@@ -1662,6 +1703,7 @@ msgid "Add an application to this list"
 msgstr "Add an application to this list"
 
 #: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:90
 msgid "Remove"
 msgstr "Remove"
 
@@ -1689,6 +1731,8 @@ msgstr "close the dialog without saving"
 msgid "shows the preferences web page"
 msgstr "shows the preferences web page"
 
+#. 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"
@@ -1760,6 +1804,7 @@ msgstr "Remember this decision and do not show this dialog."
 
 #: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
 #: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Cancel"
 
@@ -1816,10 +1861,12 @@ msgstr " work fetch deferred for"
 msgid " work fetch deferral interval"
 msgstr " work fetch deferral interval"
 
+#. set dialog title
 #: clientgui/DlgItemProperties.cpp:239
 msgid "Properties of project "
 msgstr "Properties of project "
 
+#. layout controls
 #: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "General"
@@ -1836,7 +1883,7 @@ msgstr "User name"
 msgid "Team name"
 msgstr "Team name"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "Resource share"
 
@@ -1951,11 +1998,11 @@ msgstr "Duration correction factor"
 msgid "Properties of task "
 msgstr "Properties of task "
 
-#: 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 "Name"
 
@@ -2015,7 +2062,8 @@ msgstr "Directory"
 msgid "Process ID"
 msgstr "Process ID"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
 msgid "Local: "
 msgstr "Local: "
 
@@ -2088,6 +2136,7 @@ msgid "Address:"
 msgstr "Address:"
 
 #: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
@@ -2100,11 +2149,13 @@ msgid "Leave these blank if not needed"
 msgstr "Leave these blank if not needed"
 
 #: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "User Name:"
 
 #: 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 "Password:"
 
@@ -2299,6 +2350,7 @@ msgid "The home page of the GEO-600 project"
 msgstr "The home page of the GEO-600 project"
 
 #: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
+#: clientgui/ViewProjects.cpp:247 clientgui/ViewStatistics.cpp:441
 msgid "Team"
 msgstr "Team"
 
@@ -2464,6 +2516,8 @@ msgstr "Project suspended by user"
 msgid "Task suspended by user"
 msgstr "Task suspended by user"
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Suspended - "
@@ -2620,7 +2674,7 @@ msgstr "To choose a project, click its name or type its URL below."
 msgid "Categories:"
 msgstr "Categories:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projects:"
 
@@ -2779,528 +2833,230 @@ msgstr "Autodetect"
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "Skin"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Terms of Use"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "Select the appearance of the user interface."
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Please read the following terms of use:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "Display diagnostic messages."
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "I agree to the terms of use."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Advanced View...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "I do not agree to the terms of use."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "Display the advanced graphical interface."
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Project temporarily unavailable"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "Configure display options and proxy settings"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "The project is temporarily unavailable.\n\nPlease try again later."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Account manager temporarily unavailable"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "Default"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "The account manager is temporarily unavailable.\n\nPlease try again later."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "Suspend"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Please specify an account key to continue."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "Suspend Computing"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Invalid Account Key; please enter a valid Account Key"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "Resume Computing"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Validation conflict"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "Notices"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Please specify an email address"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Open a window to view notices from projects or BOINC"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Invalid email address; please enter a valid email address"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "Get help with %s"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Missing URL"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Fetching notices; please wait..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Please specify a URL.\nFor example:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "There are no notices at this time."
+#: 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 "Invalid URL"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Close"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Please specify a valid URL.\nFor example:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "%s - Notices"
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' does not contain a valid host name."
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "For additional settings, select Computing Preferences in the Advanced View."
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' does not contain a valid path."
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "GB of disk space"
+#. 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 "Commands"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Computing Preferences"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Copy all messages"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "Discard all local preferences and use web-based preferences?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Copy selected messages"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Show only this project"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Show only the messages for the selected project."
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Messages"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Copying all messages to the clipboard..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Copying selected messages to the clipboard..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtering messages..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Show all messages"
+
+#: clientgui/ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Show messages for all projects."
+
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Fetching notices; please wait..."
+
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "There are no notices at this time."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
+msgid "Notices"
+msgstr "Notices"
+
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
 msgstr "Update"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
+#: 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 "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
 
+#: 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 "Suspend"
+
+#: 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 tasks for this project."
 
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:821
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
 msgid "No new tasks"
 msgstr "No new tasks"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "Don't get new tasks for this project."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "Reset project"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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 "Delete all files and tasks associated with this project, and get new tasks.  You can update the project first to report any completed tasks."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
+#: 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 "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
 
+#: clientgui/ViewProjects.cpp:231 clientgui/ViewWork.cpp:246
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
 msgid "Properties"
 msgstr "Properties"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr "Show project details."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr "Resume tasks for this project."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "Allow new tasks"
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "Account"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "Allow fetching new tasks for this project."
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+msgstr "Work done"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-msgid "Don't fetch new tasks for this project."
-msgstr "Don't fetch new tasks for this project."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Are you sure you want to reset project '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-msgid "Reset Project"
-msgstr "Reset Project"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Are you sure you want to remove project '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-msgid "Remove Project"
-msgstr "Remove Project"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Add Project"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Synchronize"
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Work done for this project"
-
-#: clientgui/sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Volunteer for any or all of 30+ projects in many areas of science"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Synchronize projects with account manager system"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Select a project to access with the controls below"
-
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Project Web Pages"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Project Commands"
-
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Pop up a menu of web sites for project %s"
-
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Pop up a menu of commands to apply to project %s"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Show graphics"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Show application graphics in a window."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Suspend this task."
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Abort"
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Abandon this task. You will get no credit for it."
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Show task details."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Resume work for this task."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Suspend work for this task."
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr "Are you sure you want to abort this task '%s'?\n(Progress: %.1lf%%, Status: %s)"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Abort task"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "You don't have any projects.  Please Add a Project."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Not available"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Tasks:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Select a task to access"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "From:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "This task's progress"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Task Commands"
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Pop up a menu of commands to apply to this task"
-
-#: 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: Not available"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Not Available"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Elapsed: %s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Remaining (estimated): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1228
-msgid "Retrieving current status."
-msgstr "Retrieving current status."
-
-#: clientgui/sg_TaskPanel.cpp:1234
-msgid "Downloading work from the server."
-msgstr "Downloading work from the server."
-
-#: clientgui/sg_TaskPanel.cpp:1239
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Processing Suspended:  Running On Batteries."
-
-#: clientgui/sg_TaskPanel.cpp:1241
-msgid "Processing Suspended:  User Active."
-msgstr "Processing Suspended:  User Active."
-
-#: clientgui/sg_TaskPanel.cpp:1243
-msgid "Processing Suspended:  User paused processing."
-msgstr "Processing Suspended:  User paused processing."
-
-#: clientgui/sg_TaskPanel.cpp:1245
-msgid "Processing Suspended:  Time of Day."
-msgstr "Processing Suspended:  Time of Day."
-
-#: clientgui/sg_TaskPanel.cpp:1247
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Processing Suspended:  Benchmarks Running."
-
-#: clientgui/sg_TaskPanel.cpp:1249
-msgid "Processing Suspended."
-msgstr "Processing Suspended."
-
-#: clientgui/sg_TaskPanel.cpp:1253
-msgid "Waiting to contact project servers."
-msgstr "Waiting to contact project servers."
-
-#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
-msgid "Retrieving current status"
-msgstr "Retrieving current status"
-
-#: clientgui/sg_TaskPanel.cpp:1261
-msgid "No work available to process"
-msgstr "No work available to process"
-
-#: clientgui/sg_TaskPanel.cpp:1263
-msgid "Unable to connect to the core client"
-msgstr "Unable to connect to the core client"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Terms of Use"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Please read the following terms of use:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "I agree to the terms of use."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "I do not agree to the terms of use."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Project temporarily unavailable"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "The project is temporarily unavailable.\n\nPlease try again later."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Account manager temporarily unavailable"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "The account manager is temporarily unavailable.\n\nPlease try again later."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Please specify an account key to continue."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Invalid Account Key; please enter a valid Account Key"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Validation conflict"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Please specify an email address"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Invalid email address; please enter a valid email address"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Missing URL"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "Please specify a URL.\nFor example:\nhttp://www.example.com/"
-
-#: 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 "Invalid URL"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "Please specify a valid URL.\nFor example:\nhttp://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' does not contain a valid host name."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' does not contain a valid path."
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "Commands"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Copy all messages"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Copy selected messages"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Show only this project"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Show only the messages for the selected project."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Messages"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Copying all messages to the clipboard..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Copying selected messages to the clipboard..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtering messages..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Show all messages"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Show messages for all projects."
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "Account"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "Work done"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "Avg. work done"
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
+msgstr "Avg. work done"
 
 #: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
@@ -3335,14 +3091,48 @@ msgstr "Telling project to not fetch any additional tasks..."
 msgid "Resetting project..."
 msgstr "Resetting project..."
 
+#: clientgui/ViewProjects.cpp:518 clientgui/sg_ProjectCommandPopup.cpp:229
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "Are you sure you want to reset project '%s'?"
+
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:235
+msgid "Reset Project"
+msgstr "Reset Project"
+
 #: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "Removing project..."
 
+#: clientgui/ViewProjects.cpp:576 clientgui/sg_ProjectCommandPopup.cpp:266
+#, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "Are you sure you want to remove project '%s'?"
+
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:272
+msgid "Remove Project"
+msgstr "Remove Project"
+
 #: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Launching browser..."
 
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
+msgstr "Resume tasks for this project."
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
+msgstr "Allow new tasks"
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
+msgstr "Allow fetching new tasks for this project."
+
+#: clientgui/ViewProjects.cpp:821 clientgui/sg_ProjectCommandPopup.cpp:137
+msgid "Don't fetch new tasks for this project."
+msgstr "Don't fetch new tasks for this project."
+
 #: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Requested by user"
@@ -3626,195 +3416,444 @@ msgstr ".\nYou can enable it using the Activity menu."
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "Retrying transfer now..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "Retrying transfer now..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "Aborting transfer..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "Are you sure you want to abort this file transfer '%s'?\nNOTE: Aborting a transfer will invalidate a task and you\nwill not receive credit for it."
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "Abort File Transfer"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "Upload"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "Download"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "retry in "
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "failed"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "suspended"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "active"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "pending"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr " (project backoff: "
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "Show active tasks"
+
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
+msgid "Show only active tasks."
+msgstr "Show only active tasks."
+
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
+msgid "Show graphics"
+msgstr "Show graphics"
+
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
+msgid "Show application graphics in a window."
+msgstr "Show application graphics in a window."
+
+#: clientgui/ViewWork.cpp:225
+msgid "Show VM Console"
+msgstr "Show VM Console"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "Show VM Console in a window."
+
+#: clientgui/ViewWork.cpp:233
+msgid "Suspend work for this result."
+msgstr "Suspend work for this result."
+
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
+msgid "Abort"
+msgstr "Abort"
+
+#: clientgui/ViewWork.cpp:240
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Abandon work on the result. You will get no credit for it."
+
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
+msgid "Show task details."
+msgstr "Show task details."
+
+#: clientgui/ViewWork.cpp:264
+msgid "Remaining (estimated)"
+msgstr "Remaining (estimated)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "Deadline"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "Tasks"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "Resuming task..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "Suspending task..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "Showing graphics for task..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "Showing VM console for task..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Are you sure you want to abort this task '%s'?\n(Progress: %s, Status: %s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Are you sure you want to abort these %d tasks?"
+
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
+msgid "Abort task"
+msgstr "Abort task"
+
+#: clientgui/ViewWork.cpp:586
+msgid "Aborting task..."
+msgstr "Aborting task..."
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "Show all tasks"
+
+#: clientgui/ViewWork.cpp:859
+msgid "Show all tasks."
+msgstr "Show all tasks."
+
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr "Resume work for this task."
+
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr "Suspend work for this task."
+
+#: clientgui/WizardAttach.cpp:571
+msgid "Do you really want to cancel?"
+msgstr "Do you really want to cancel?"
+
+#: clientgui/WizardAttach.cpp:572
+msgid "Question"
+msgstr "Question"
+
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "Pie Ctrl"
+
+#: 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 "Hide %s"
+
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
+msgstr "Hide Others"
+
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
+msgstr "Show All"
+
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
+msgstr "Quit %s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr "Skin"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr "Select the appearance of the user interface."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Advanced View...\tCtrl+Shift+A"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
+msgstr "Display the advanced graphical interface."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr "Configure display options and proxy settings"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr "Display diagnostic messages."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
+msgstr "Default"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
+msgstr "Suspend Computing"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
+msgstr "Resume Computing"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Open a window to view notices from projects or BOINC"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:360
+#, c-format
+msgid "Get help with %s"
+msgstr "Get help with %s"
+
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Close"
+
+#: clientgui/sg_DlgMessages.cpp:394
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Notices"
+
+#: clientgui/sg_DlgPreferences.cpp:206
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "For additional settings, select Computing Preferences in the Advanced View."
+
+#: clientgui/sg_DlgPreferences.cpp:340
+msgid "GB of disk space"
+msgstr "GB of disk space"
+
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - Computing Preferences"
+
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "Discard all local preferences and use web-based preferences?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Add Project"
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "Aborting transfer..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Synchronize"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "Are you sure you want to abort this file transfer '%s'?\nNOTE: Aborting a transfer will invalidate a task and you\nwill not receive credit for it."
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Work done for this project"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "Abort File Transfer"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "Volunteer for any or all of 30+ projects in many areas of science"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "Upload"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Synchronize projects with account manager system"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-msgstr "Download"
+#. 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 "Select a project to access with the controls below"
 
-#: clientgui/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "retry in "
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Project Web Pages"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "failed"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Project Commands"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "suspended"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Pop up a menu of web sites for project %s"
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
-msgstr "active"
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Pop up a menu of commands to apply to project %s"
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "pending"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "Suspend this task."
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr " (project backoff: "
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Abandon this task. You will get no credit for it."
 
-#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-msgstr "Show active tasks"
+#: clientgui/sg_TaskCommandPopup.cpp:267
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Are you sure you want to abort this task '%s'?\n(Progress: %.1lf%%, Status: %s)"
 
-#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "Show only active tasks."
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "You don't have any projects.  Please Add a Project."
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "Show VM Console"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "Not available"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "Show VM Console in a window."
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "Tasks:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-msgstr "Suspend work for this result."
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
+msgstr "Select a task to access"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Abandon work on the result. You will get no credit for it."
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "From:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "Remaining (estimated)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "This task's progress"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "Deadline"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "Task Commands"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "Tasks"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Pop up a menu of commands to apply to this task"
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "Resuming task..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "Application: %s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "Suspending task..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "Showing graphics for task..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "Application: Not available"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "Showing VM console for task..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "Not Available"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "Are you sure you want to abort this task '%s'?\n(Progress: %s, Status: %s)"
+msgid "Elapsed: %s"
+msgstr "Elapsed: %s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Are you sure you want to abort these %d tasks?"
+msgid "Remaining (estimated): %s"
+msgstr "Remaining (estimated): %s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "Aborting task..."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "Status: %s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "Show all tasks"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "Retrieving current status."
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "Show all tasks."
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "Downloading work from the server."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Add project or account manager"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Processing Suspended:  Running On Batteries."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Add project or use BOINC Account Manager"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+msgstr "Processing Suspended:  User Active."
 
-#: 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 "If possible, add projects at the\n%s web site.\n\nProjects added via this wizard will not be\nlisted on or managed via %s."
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "Processing Suspended:  User paused processing."
 
-#: 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 "There are over 30 BOINC-based projects\ndoing research in many areas of science,\nand you can volunteer for as many of them as you like.\nYou can add a project directly,\nor use an 'Account Manager' web site to select projects."
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "Processing Suspended:  Time of Day."
 
-#: 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 "You have chosen to add a new volunteer computing project or change which projects\nyou contribute to.\n\nSome of these projects are run and managed by World Community Grid, while others\nare run and managed by other researchers or organizations. The BOINC software\ncan divide your spare processing power among any combination of projects.\n\nAlternatively, if you have registered with a BOINC Account Manager, you can use\nthis to choose which projects to support.\n\nPlease choose w [...]
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Processing Suspended:  Benchmarks Running."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Use a BOINC Account Manager"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "Processing Suspended."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Add or change your World Community Grid projects"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "Waiting to contact project servers."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Add projects run by other researchers or organizations"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "Retrieving current status"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "Do you really want to cancel?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "No work available to process"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-msgstr "Question"
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
+msgstr "Unable to connect to the core client"
 
 #: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
@@ -3828,32 +3867,7 @@ msgstr "< &Back"
 msgid "&Finish"
 msgstr "&Finish"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Services"
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Hide %s"
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Hide Others"
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Show All"
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "Quit %s"
-
+#. /////////////////////////////////////////////////////////////////////////
 #: clientgui/DlgAdvPreferencesBase.h:45
 msgid "On this day of the week, compute only during these hours."
 msgstr "On this day of the week, compute only during these hours."
diff --git a/locale/fr/BOINC-Client.mo b/locale/fr/BOINC-Client.mo
index 0f2d50b..87bd269 100644
Binary files a/locale/fr/BOINC-Client.mo and b/locale/fr/BOINC-Client.mo differ
diff --git a/locale/fr/BOINC-Client.po b/locale/fr/BOINC-Client.po
old mode 100755
new mode 100644
index 0333dc3..d1e3ec6
--- 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 <EMAIL at ADDRESS>, YEAR.
+# 
+# Translators:
+# Axelle Andy <andex at 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 at pobox.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: fr\n"
+"PO-Revision-Date: 2015-05-01 12:43+0000\n"
+"Last-Translator: Axelle Andy <andex at 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."
diff --git a/locale/fr/BOINC-Manager.mo b/locale/fr/BOINC-Manager.mo
index 6a62fd7..3a62554 100644
Binary files a/locale/fr/BOINC-Manager.mo and b/locale/fr/BOINC-Manager.mo differ
diff --git a/locale/fr/BOINC-Manager.po b/locale/fr/BOINC-Manager.po
index 8611ee4..6478c8c 100644
--- a/locale/fr/BOINC-Manager.po
+++ b/locale/fr/BOINC-Manager.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Arnaud <bidibulle25_at_yahoo.fr>, 2007
+# Axelle Andy <andex at voila.fr>, 2015
 # BUNS Nicolas, 2015
 # Jerome Cadet <jerome.cadet at pobox.com>, 2015
 # PINSET Romaric <pinset.romaric at gmail.com>, 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-03-25 22:28+0000\n"
-"Last-Translator: Jerome Cadet <jerome.cadet at pobox.com>\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 <andex at 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: 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:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "Ajouter un projet"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "&Utiliser le gestionnaire de compte..."
 
-#: 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:457
+msgid "Use an account manager to control this computer."
+msgstr "Utilisez un gestionnaire de compte pour contrôler cet ordinateur."
 
-#: clientgui/AdvancedFrame.cpp:459
+#: 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 <dont_suspend_nci>
 #: 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,533 +2839,235 @@ msgstr "Détection automatique"
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "Apparence"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Conditions d'utilisation"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "Choisissez l'apparence de l'interface utilisateur."
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Merci de lire les conditions d'utilisation suivantes:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "Afficher les messages de diagnostique."
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "J'accepte les conditions d'utilisation."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Vue Avancée\tCTRL+SHIFT+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Je n'accepte pas les conditions d'utilisation."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "Afficher l'interface graphique avancée."
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projet momentanément indisponible"
 
-#: 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/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Le projet est momentanément indisponible.\n\nEssayez plus tard, svp."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Gestionnaire de compte momentanément indisponible"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "Valeur par défaut"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Le gestionnaire de compte est momentanément indisponible.\n\nEssayez plus tard, svp."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "Suspendre"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Entrez une clé d'identification pour continuer, svp."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "Suspendre le calcul"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Clé d'identification non valide; entrez une clé d'identification valide, s'il vous plaît"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "Reprendre le calcul"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Conflit de validation"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "Remarques"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Veuillez entrer une adresse email"
 
-#: 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/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Adresse email non valide; entrez une adresse email valide, s'il vous plaît"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "Obtenir de l'aide avec %s"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "URL manquante"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Recherche d'avis; patientez s'il-vous-plaît..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Veuillez entrer une URL.\nPar exemple:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Il n'y a pas de nouveaux messages."
+#: 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 "URL non valide"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Fermer"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Veuillez entrer une URL valide.\nPar exemple:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "Notifications de %s"
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' ne contient pas de nom d'hôte valide."
 
-#: 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/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' ne contient pas de chemin valide."
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "Go d'espace disque"
+#. 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"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Préférences de calcul"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Copier tous les messages"
 
-#: 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/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Copier les messages sélectionnés"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Ne montrer que ce projet"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Ne montrer les messages que pour le projet sélectionné."
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Messages"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Copie de tous les messages dans le presse-papiers en cours..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Copie les messages sélectionnés dans le presse-papiers..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtrer les messages..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Montrer tous les messages"
+
+#: clientgui/ViewMessages.cpp:495
+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/sg_ProjectCommandPopup.cpp:67
+#: 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/sg_ProjectCommandPopup.cpp:79
+#: 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/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "Recommencer le projet"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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/sg_ProjectCommandPopup.cpp:91
+#: 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/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 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/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "Compte"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "Autoriser du nouveau travail"
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+msgstr "Travail effectué"
 
-#: 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:249
+msgid "Avg. work done"
+msgstr "Travail moyen"
 
-#: 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"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Merci de lire les conditions d'utilisation suivantes:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "J'accepte les conditions d'utilisation."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Je n'accepte pas les conditions d'utilisation."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projet momentanément indisponible"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "Le projet est momentanément indisponible.\n\nEssayez plus tard, svp."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Gestionnaire de compte momentanément indisponible"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "Le gestionnaire de compte est momentanément indisponible.\n\nEssayez plus tard, svp."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Entrez une clé d'identification pour continuer, svp."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Clé d'identification non valide; entrez une clé d'identification valide, s'il vous plaît"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Conflit de validation"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Veuillez entrer une adresse email"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Adresse email non valide; entrez une adresse email valide, s'il vous plaît"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "URL manquante"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "Veuillez entrer une URL.\nPar exemple:\nhttp://www.example.com/"
-
-#: 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 "URL non valide"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "Veuillez entrer une URL valide.\nPar exemple:\nhttp://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' ne contient pas de nom d'hôte valide."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' ne contient pas de chemin valide."
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "Commandes"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Copier tous les messages"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Copier les messages sélectionnés"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Ne montrer que ce projet"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Ne montrer les messages que pour le projet sélectionné."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Messages"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Copie de tous les messages dans le presse-papiers en cours..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Copie les messages sélectionnés dans le presse-papiers..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtrer les messages..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Montrer tous les messages"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Montre les messages pour tous les projets."
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "Compte"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "Travail effectué"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "Travail moyen"
-
-#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
-#: clientgui/ViewWork.cpp:262
-msgid "Status"
-msgstr "Etat"
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
+msgid "Status"
+msgstr "Etat"
 
 #: clientgui/ViewProjects.cpp:330
 msgid "Projects"
@@ -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"
@@ -3630,195 +3422,444 @@ msgstr ".\nVous pouvez l'activer par le menu Activité."
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "Réessai du transfert en cours..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "Réessai du transfert en cours..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "Annulation du transfert en cours..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "Etes-vous sûr de vouloir abandonner le transfert de ce fichier '%s' ?\nNOTE: L'abandon d'un transfert invalidera la tâche et\nvous ne recevrez pas de crédits pour cette tâche."
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "Annuler le transfert de fichier"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "Envoi"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "Téléchargement"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "réessayer dans "
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "échoué"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "suspendu"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "actif"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "en attente"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr " (retrait de projet: "
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "Montrer les tâches actives"
+
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
+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"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "Montrer la console VM dans une fenêtre."
+
+#: clientgui/ViewWork.cpp:233
+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)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "Date limite d'envoi"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "Tâches"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "Reprise de la tâche en cours..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "Suspension de la tâche en cours..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "Affichage des graphiques de cette tâche en cours..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "Montrer la console VM pour la tâche..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Etes-vous sûr de vouloir abandonner cette tâche '%s' ?\n(Avancement: %s, Etat: %s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+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..."
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "Montrer toutes les tâches"
+
+#: clientgui/ViewWork.cpp:859
+msgid "Show all tasks."
+msgstr "Montre toutes les tâches."
+
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr "Reprendre le calcul de cette unité."
+
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr "Suspendre le calcul de cette unité."
+
+#: clientgui/WizardAttach.cpp:563
+msgid "Do you really want to cancel?"
+msgstr "Voulez-vous vraiment annuler ?"
+
+#: 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/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "Annulation du transfert en cours..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Synchroniser"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "Etes-vous sûr de vouloir abandonner le transfert de ce fichier '%s' ?\nNOTE: L'abandon d'un transfert invalidera la tâche et\nvous ne recevrez pas de crédits pour cette tâche."
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Travail terminé pour ce projet"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "Annuler le transfert de fichier"
+#: 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/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "Envoi"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Synchroniser les projets avec le gestionnaire de compte"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-msgstr "Téléchargement"
+#. 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/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "réessayer dans "
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Sites Web du projet"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "échoué"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Commandes du projet"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "suspendu"
+#: 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/ViewTransfers.cpp:878
-msgid "active"
-msgstr "actif"
+#: 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/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "en attente"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "Suspendre cette tâche."
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr " (retrait de projet: "
+#: 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/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-msgstr "Montrer les tâches actives"
+#: 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/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "Ne montre que les tâches actives."
+#: 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/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "Montrer la console VM"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "Non disponible"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "Montrer la console VM dans une fenêtre."
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "Tâches:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-msgstr "Suspendre le calcul de cette unité."
+#. 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/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/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "De:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "Restant (estimation)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "Avancement de cette tâche"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "Date limite d'envoi"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "Commandes de tâche"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "Tâches"
+#: 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/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "Reprise de la tâche en cours..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "Application: %s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "Suspension de la tâche en cours..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "Affichage des graphiques de cette tâche en cours..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "Application: Non disponible"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "Montrer la console VM pour la tâche..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "Non disponible"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "Etes-vous sûr de vouloir abandonner cette tâche '%s' ?\n(Avancement: %s, Etat: %s)"
+msgid "Elapsed: %s"
+msgstr "Écoulé: %s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Etes-vous sûr de vouloir annuler ces %d tâches ?"
+msgid "Remaining (estimated): %s"
+msgstr "Restant (estimation): %s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "Annulation de la tâche..."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "Statut: %s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "Montrer toutes les tâches"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "Recherche de l'état actuel"
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "Montre toutes les tâches."
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "Téléchargement du travail depuis le serveur en cours"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Ajouter un projet ou un gestionnaire de compte"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Traitement Suspendu: Fonctionne sur Batteries."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Ajouter un projet ou utiliser un Gestionnaire de Compte BOINC."
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+msgstr "Traitement Suspendu: Utilisateur Actif"
 
-#: 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/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "Traitement Suspendu: L'utilisateur a mis en pause le traitement."
 
-#: 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/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "Traitement Suspendu: Moment de la Journée."
 
-#: 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'u [...]
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Traitement Suspendu: Tests de puissance de l'ordinateur."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Utiliser un gestionnaire de compte BOINC"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "Traitement Suspendu."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Ajouter ou modifier vos projets World Community Grid"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "En attente du contact des serveurs des projets."
 
-#: 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/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "Recherche de l'état actuel"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "Voulez-vous vraiment annuler ?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "Aucun travail disponible à traiter"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-msgstr "Question"
+#: 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 >"
@@ -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/fr/BOINC-Project-Generic.po b/locale/fr/BOINC-Project-Generic.po
index 1ea15d3..f91b7b7 100644
--- a/locale/fr/BOINC-Project-Generic.po
+++ b/locale/fr/BOINC-Project-Generic.po
@@ -6,13 +6,16 @@
 # FileID  : $Id$
 # 
 # Translators:
+# Jerome Cadet <jerome.cadet at pobox.com>, 2015
+# Jun Seo <seo.galileo at gmail.com>, 2015
+# PINSET Romaric <pinset.romaric at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
-"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2015-02-08 17:07+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-05-07 12:43+0000\n"
+"Last-Translator: Jerome Cadet <jerome.cadet at pobox.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/boinc/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,6 +30,96 @@ msgstr "LANG_NAME_NATIVE"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "LANG_NAME_INTERNATIONAL"
 
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "Code d'invitation"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "Un code d'invitation valide est requis pour créer un compte."
+
+#: ../inc/account.inc:44 ../inc/host.inc:674 ../inc/result.inc:632
+#: ../inc/team.inc:219 ../inc/team.inc:367 ../inc/user.inc:198
+#: ../user/account_finish.php:41 ../user/team_admins.php:64
+#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:73
+#: ../user/top_users.php:49 ../user/user_search.php:124
+msgid "Name"
+msgstr "Nom"
+
+#: ../inc/account.inc:44 ../user/account_finish.php:41
+msgid "Identifies you on our web site. Use your real name or a nickname."
+msgstr "Vous identifie sur notre site web. Utilisez votre nom réel ou un pseudonyme."
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "Adresse email"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "Doit être une adresse valide de type 'nom at domaine'."
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "%1 caractères au moins"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "Confirmation du mot de passe"
+
+#: ../inc/account.inc:63 ../inc/team.inc:43 ../inc/team.inc:129
+#: ../inc/team.inc:242 ../inc/team.inc:382 ../inc/team.inc:470
+#: ../inc/user.inc:212 ../inc/user.inc:395 ../user/account_finish.php:45
+#: ../user/edit_user_info_form.php:38 ../user/profile_search_action.php:44
+#: ../user/team_email_list.php:73 ../user/team_search.php:85
+#: ../user/top_users.php:63 ../user/user_search.php:53
+#: ../user/user_search.php:125
+msgid "Country"
+msgstr "Pays"
+
+#: ../inc/account.inc:63 ../user/account_finish.php:45
+msgid "Select the country you want to represent, if any."
+msgstr "Le cas échéant, choisissez le pays que vous représenteriez."
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "Code postal"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "Facultatif"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "Création de compte"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "Adresse email :"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "adresse email oubliée ?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "mot de passe oublié ?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "Rester connecté"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "Connexion"
+
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
 msgstr "Texte en gras: [b]texte[/b]  (alt+b)"
@@ -40,323 +133,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr "Texte souligné: [u]texte[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "Texte barré : [s]text[/s]  (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "Citation : [quote]texte[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "Affichage de code: [code]code[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "Liste: [list]texte[/list]  (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "Liste triée: [list=]texte[/list]  (alt+o)"
 
-#: ../inc/bbcode_html.inc:32
+#: ../inc/bbcode_html.inc:35
 msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
 msgstr "Insérer une image: [img]http://image_url[/img]  (alt+p)"
 
-#: ../inc/bbcode_html.inc:35
+#: ../inc/bbcode_html.inc:38
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
 msgstr "Insérer une adresse: [url]http://url[/url] ou [url=http://url]Texte de l'URL[/url]  (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "Couleur de la police"
 
-#: ../inc/bbcode_html.inc:43
+#: ../inc/bbcode_html.inc:46
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
 msgstr "Couleur de la police: [color=red]texte[/color] Astuce: vous pouvez aussi utiliser color=#FF0000"
 
-#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
+#: ../inc/bbcode_html.inc:47 ../inc/bbcode_html.inc:62
+#: ../inc/prefs_util.inc:546
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "Rouge foncé"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "Rouge"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "Orange"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "Marron"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "Jaune"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
 msgstr "Vert"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
 msgstr "Vert olive"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
 msgstr "Cyan"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
 msgstr "Bleu"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "Bleu foncé"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "Bleu foncé violacé (indigo)"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
 msgstr "Violet"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
 msgstr "Taille de la police"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
 msgstr "Taille de la police: [size=x-small]texte en petit[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
 msgstr "Petit"
 
-#: ../inc/bbcode_html.inc:61
+#: ../inc/bbcode_html.inc:64
 msgid "Normal"
 msgstr "Normal"
 
-#: ../inc/bbcode_html.inc:62
+#: ../inc/bbcode_html.inc:65
 msgid "Large"
 msgstr "Grand"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close all open bbCode tags"
 msgstr "Fermer toutes les balises bbCode ouvertes"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
 msgstr "Fermer les balises"
 
-#: ../inc/forum.inc:37
+#: ../inc/forum.inc:38
 msgid "Oldest first"
 msgstr "Le plus ancien en premier"
 
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
 msgid "Newest first"
 msgstr "Le plus récent en premier"
 
-#: ../inc/forum.inc:39
+#: ../inc/forum.inc:40
 msgid "Highest rated posts first"
 msgstr "Les messages les mieux classés en premier"
 
-#: ../inc/forum.inc:41
+#: ../inc/forum.inc:42
 msgid "Newest post first"
 msgstr "Les messages les plus récents en premier"
 
-#: ../inc/forum.inc:42
+#: ../inc/forum.inc:43
 msgid "Most views first"
 msgstr "Les plus lus en premier"
 
-#: ../inc/forum.inc:43
+#: ../inc/forum.inc:44
 msgid "Most posts first"
 msgstr "Le plus de messages en premier "
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search for words in forum messages"
 msgstr "Chercher des mots dans les messages du forum"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search forums"
 msgstr "Chercher dans les forums"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:127
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
-#: ../user/pm.php:133
+#: ../inc/forum.inc:133 ../inc/user.inc:325 ../user/pm.php:69
+#: ../user/pm.php:138
 msgid "Private messages"
 msgstr "Messages privés"
 
-#: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
-#: ../user/forum_forum.php:71 ../user/sample_index.php:130
+#: ../inc/forum.inc:152 ../user/forum_forum.php:74
+#: ../user/sample_index.php:128
 msgid "Questions and Answers"
 msgstr "Questions / Réponses"
 
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250
-#: ../inc/user.inc:375 ../user/bs_sample_index.php:62
-#: ../user/forum_forum.php:73 ../user/sample_index.php:129
-#: ../project.sample/project.inc:43
+#: ../inc/forum.inc:152 ../inc/forum.inc:184 ../inc/user.inc:321
+#: ../inc/user.inc:454 ../user/forum_forum.php:76 ../user/sample_index.php:127
+#: ../project.sample/project.inc:70
 msgid "Message boards"
 msgstr "Forums"
 
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
 msgid "%1 message board"
 msgstr "Forum %1"
 
-#: ../inc/forum.inc:245 ../inc/result.inc:695
+#: ../inc/forum.inc:246 ../inc/result.inc:717
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../inc/forum.inc:283 ../inc/result.inc:704
+#: ../inc/forum.inc:284 ../inc/result.inc:726
 msgid "Next"
 msgstr "Suivant"
 
-#: ../inc/forum.inc:412 ../inc/forum.inc:1175 ../user/forum_forum.php:137
-#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
+#: ../inc/forum.inc:413 ../inc/forum.inc:1218 ../user/forum_forum.php:140
+#: ../user/forum_reply.php:126 ../user/forum_report_post.php:79
 msgid "Author"
 msgstr "Auteur"
 
-#: ../inc/forum.inc:412 ../inc/pm.inc:86 ../user/forum_edit.php:128
-#: ../user/forum_edit.php:133 ../user/forum_post.php:116
-#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
-#: ../user/pm.php:90 ../user/pm.php:144
+#: ../inc/forum.inc:413 ../inc/pm.inc:86 ../user/forum_edit.php:128
+#: ../user/forum_edit.php:133 ../user/forum_post.php:120
+#: ../user/forum_reply.php:126 ../user/forum_report_post.php:79
+#: ../user/pm.php:90 ../user/pm.php:149
 msgid "Message"
 msgstr "Message"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send message"
 msgstr "Envoyer  message"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
 msgstr "Envoyer à %1 un message privé"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
 msgstr "A rejoint: %1"
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr "Messages: %1"
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
 msgstr "Crédit: %1"
 
-#: ../inc/forum.inc:597
+#: ../inc/forum.inc:600
 msgid "RAC: %1"
 msgstr "RAC: %1"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "You haven't read this message yet"
 msgstr "Vous n'avez pas encore lu ce message"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "Non lu"
 
-#: ../inc/forum.inc:623 ../inc/forum.inc:628 ../inc/forum.inc:727
+#: ../inc/forum.inc:627 ../inc/forum.inc:632 ../inc/forum.inc:731
 msgid "Message %1"
 msgstr "Message %1"
 
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:628 ../inc/user.inc:409 ../user/forum_forum.php:178
 msgid "hidden"
 msgstr "caché"
 
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
 msgstr "Publié par: %1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:632
 msgid " - in response to "
 msgstr " - en réponse à "
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:635
 msgid "Edit"
 msgstr "Editer"
 
-#: ../inc/forum.inc:631
+#: ../inc/forum.inc:635
 msgid "Edit this message"
 msgstr "Éditer ce message"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
 msgstr "Dernière modification: %1"
 
-#: ../inc/forum.inc:640
+#: ../inc/forum.inc:644
 msgid ""
 "This post is not shown because the sender is on your 'ignore' list.  Click "
 "%1here%2 to view this post"
 msgstr "Ce message n'est pas affiché car l'expéditeur est dans votre liste d'expéditeurs ignorés.   Cliquez %1ici%2 pour afficher ce message."
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
 msgstr "Signaler ce message offensant"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
 msgstr "Signaler comme offensant"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
 msgstr "Classement: %1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
 msgstr "classer: "
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
 msgstr "Cliquez si vous aimez ce message"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
 msgstr "Classement +"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
 msgstr "Cliquez si vous n'aimez pas ce message"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
 msgstr "Classement -"
 
-#: ../inc/forum.inc:685 ../user/pm.php:106 ../user/pm.php:146
+#: ../inc/forum.inc:689 ../user/pm.php:111 ../user/pm.php:151
 msgid "Reply"
 msgstr "Répondre"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:689
 msgid "Post a reply to this message"
 msgstr "Répondre à ce message"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Quote"
 msgstr "Citer"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
 msgstr "Répondre en citant ce message"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
 msgstr "Caché par un modérateur"
 
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
 msgstr "%1 Publié par %2"
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
 msgstr "Vous ne pouvez pas répondre ou classer de message jusqu'au %1"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -374,344 +471,351 @@ msgid ""
 "        "
 msgstr "\n                                 <ul>\n                                 <li> Les messages doivent être «adapté aux enfants»: ils ne peuvent pas contenir\n                                              de contenu obscène, incitant à la haine,\n                                               sexuellement explicite ou suggestif.\n                                 <li> Pas de publicité commerciale.\n                                 <li> Pas de liens vers des sites Web ayant un contenu [...]
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
 msgstr "Règles:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:785
 msgid "More info"
 msgstr "Plus d'informations"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
 msgid "Unhide"
 msgstr "Démasquer"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
 msgstr "Démasquer ce message"
 
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
+#: ../inc/forum.inc:1084 ../user/forum_thread.php:196
 msgid "Hide"
 msgstr "Masquer"
 
-#: ../inc/forum.inc:1057
+#: ../inc/forum.inc:1084
 msgid "Hide this post"
 msgstr "Masquer ce message"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
 msgid "Move"
 msgstr "Déplacer"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
 msgstr "Déplacer ce message vers une autre discussion"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1094
 msgid "Banish author"
 msgstr "Bannir l'utilisateur"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
 msgstr "Voter pour bannir cet utilisateur"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
 msgstr "Voter pour ne pas bannir cet utilisateur"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
 msgstr "Débuter un vote pour bannir cet utilisateur"
 
-#: ../inc/forum.inc:1116
+#: ../inc/forum.inc:1115 ../inc/user.inc:312 ../user/forum_thread.php:243
+#: ../user/pm.php:112 ../user/pm.php:152
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "Supprimer ce message"
+
+#: ../inc/forum.inc:1153
 msgid "Only team members can post to the team message board"
 msgstr "Seuls les membres d'équipes peuvent écrire dans le forum d'équipe"
 
-#: ../inc/forum.inc:1126
+#: ../inc/forum.inc:1163
 msgid ""
 "In order to create a new thread in %1 you must have a certain amount of "
 "credit. This is to prevent and protect against abuse of the system."
 msgstr "Pour pouvoir créer un nouveau sujet dans %1 vous devez disposer d'une certaine quantité de crédit. Cette mesure a pour but de prévenir les abus."
 
-#: ../inc/forum.inc:1133
+#: ../inc/forum.inc:1170
 msgid ""
 "You cannot create any more threads right now. Please wait a while before "
 "trying again. This delay has been enforced to protect against abuse of the "
 "system."
 msgstr "Vous ne pouvez pas créer de sujet supplémentaire dans l'immédiat. Veuillez attendre un moment puis réessayer. Ce délai a été instauré pour prévenir les abus."
 
-#: ../inc/forum.inc:1140
+#: ../inc/forum.inc:1177
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
 msgstr "Ce sujet est verrouillé. Seul les modérateurs et administrateurs du forum sont autorisés à écrire ici."
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
 msgstr "Vous ne pouvez pas écrire dans une discussion masquée."
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "Sujet"
 
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
-#: ../user/forum_index.php:94
+#: ../inc/forum.inc:1217 ../inc/team.inc:135 ../user/forum_forum.php:139
+#: ../user/forum_index.php:99
 msgid "Posts"
 msgstr "Messages"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1219 ../user/forum_forum.php:141
 msgid "Views"
 msgstr "Vues"
 
-#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
-#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
+#: ../inc/forum.inc:1220 ../inc/team.inc:135 ../user/forum_forum.php:142
+#: ../user/forum_help_desk.php:48 ../user/forum_index.php:100
 msgid "Last post"
 msgstr "Dernier message"
 
-#: ../inc/forum.inc:1235
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
 msgstr "Nouveaux messages dans la discussion %1"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
 msgstr "Nouveaux messages dans une discussion suivie"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
 msgstr "Il y a de nouveaux messages dans la discussion '%1'"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "Marquer toutes les discussions comme lues"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
 msgstr "Marquer tous les sujets de tous les forums comme 'lus'."
 
-#: ../inc/host.inc:24
+#: ../inc/host.inc:25
 msgid "No host"
 msgstr "Aucun hôte"
 
-#: ../inc/host.inc:26
+#: ../inc/host.inc:27
 msgid "Unavailable"
 msgstr "Indisponible"
 
-#: ../inc/host.inc:56 ../inc/prefs.inc:639 ../inc/prefs.inc:1048
+#: ../inc/host.inc:56 ../inc/prefs.inc:665 ../inc/prefs_util.inc:547
 msgid "Home"
 msgstr "Maison"
 
-#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
+#: ../inc/host.inc:57 ../inc/prefs.inc:666 ../inc/prefs_util.inc:549
+#: ../user/server_status.php:138
 msgid "Work"
 msgstr "Travail"
 
-#: ../inc/host.inc:58 ../inc/prefs.inc:640 ../inc/prefs.inc:1050
+#: ../inc/host.inc:58 ../inc/prefs.inc:667 ../inc/prefs_util.inc:548
 msgid "School"
 msgstr "École"
 
-#: ../inc/host.inc:59
-msgid "Mobile"
-msgstr "Mobile"
-
-#: ../inc/host.inc:61 ../user/edit_forum_preferences_form.php:172
-#: ../user/edit_forum_preferences_form.php:173
+#: ../inc/host.inc:60 ../user/edit_forum_preferences_form.php:161
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Update"
 msgstr "Mise à jour"
 
-#: ../inc/host.inc:85
+#: ../inc/host.inc:84
 msgid "Computer information"
 msgstr "Informations sur l'ordinateur"
 
-#: ../inc/host.inc:89 ../inc/host.inc:94
+#: ../inc/host.inc:88 ../inc/host.inc:93
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr "(identiques les %1 dernières fois)"
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr "Adresse IP externe"
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr "Afficher l'adresse IP"
 
-#: ../inc/host.inc:96
+#: ../inc/host.inc:95
 msgid "Domain name"
 msgstr "Nom de domaine"
 
-#: ../inc/host.inc:98
+#: ../inc/host.inc:97
 msgid "Product name"
 msgstr "Nom du produit"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "Local Standard Time"
 msgstr "Heure locale"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "UTC %1 hours"
 msgstr "%1 heures Temps Universel (UTC)"
 
-#: ../inc/host.inc:106 ../inc/host.inc:108 ../inc/host.inc:222
+#: ../inc/host.inc:105 ../inc/host.inc:107 ../inc/host.inc:222
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../inc/host.inc:108 ../inc/host.inc:355
+#: ../inc/host.inc:107 ../inc/host.inc:360
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../inc/host.inc:112 ../inc/result.inc:630
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
 msgid "Created"
 msgstr "Créé"
 
-#: ../inc/host.inc:113 ../inc/host.inc:226 ../inc/host.inc:231
-#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:215
-#: ../inc/team.inc:220 ../inc/team.inc:222 ../inc/team.inc:364
-#: ../inc/team.inc:369 ../inc/user.inc:125 ../inc/user.inc:138
-#: ../user/profile_search_action.php:43
-#: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64
-#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
-#: ../user/top_users.php:59 ../user/user_search.php:140
+#: ../inc/host.inc:112 ../inc/host.inc:226 ../inc/host.inc:231
+#: ../inc/host.inc:686 ../inc/team.inc:105 ../inc/team.inc:224
+#: ../inc/team.inc:229 ../inc/team.inc:231 ../inc/team.inc:373
+#: ../inc/team.inc:378 ../inc/user.inc:126 ../inc/user.inc:139
+#: ../user/profile_search_action.php:45
+#: ../user/team_change_founder_form.php:80 ../user/team_email_list.php:73
+#: ../user/team_remove_inactive_form.php:43 ../user/top_users.php:54
+#: ../user/top_users.php:59 ../user/user_search.php:125
 msgid "Total credit"
 msgstr "Crédit total"
 
-#: ../inc/host.inc:114 ../inc/user.inc:125 ../user/team_search.php:70
-#: ../user/user_search.php:139
+#: ../inc/host.inc:113 ../inc/user.inc:126 ../user/team_search.php:83
+#: ../user/user_search.php:124
 msgid "Average credit"
 msgstr "Crédit moyen"
 
-#: ../inc/host.inc:116
+#: ../inc/host.inc:115
 msgid "Cross project credit"
 msgstr "Crédit inter-projet"
 
-#: ../inc/host.inc:118
+#: ../inc/host.inc:117
 msgid "CPU type"
 msgstr "Type de CPU"
 
-#: ../inc/host.inc:119
+#: ../inc/host.inc:118
 msgid "Number of processors"
 msgstr "Nombre de processeurs"
 
-#: ../inc/host.inc:121
+#: ../inc/host.inc:120
 msgid "Coprocessors"
 msgstr "Coprocesseurs"
 
-#: ../inc/host.inc:123 ../inc/host.inc:687
+#: ../inc/host.inc:122 ../inc/host.inc:692
 msgid "Operating System"
 msgstr "Système d'exploitation"
 
-#: ../inc/host.inc:126 ../inc/host.inc:235
+#: ../inc/host.inc:125 ../inc/host.inc:235
 msgid "BOINC version"
 msgstr "Version de BOINC"
 
-#: ../inc/host.inc:130
+#: ../inc/host.inc:129 ../inc/prefs.inc:237
 msgid "Memory"
 msgstr "Mémoire"
 
-#: ../inc/host.inc:130 ../inc/host.inc:140
+#: ../inc/host.inc:129 ../inc/host.inc:139
 msgid "%1 MB"
 msgstr "%1 Mo"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "Cache"
 msgstr "Cache"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "%1 KB"
 msgstr "%1 Ko"
 
-#: ../inc/host.inc:140
+#: ../inc/host.inc:139
 msgid "Swap space"
 msgstr "Espace d'échange (swap)"
 
-#: ../inc/host.inc:143
+#: ../inc/host.inc:142
 msgid "Total disk space"
 msgstr "Taille totale de disque"
 
-#: ../inc/host.inc:143 ../inc/host.inc:146
+#: ../inc/host.inc:142 ../inc/host.inc:145
 msgid "%1 GB"
 msgstr "%1 Go"
 
-#: ../inc/host.inc:146
+#: ../inc/host.inc:145
 msgid "Free Disk Space"
 msgstr "Espace disque disponible"
 
-#: ../inc/host.inc:150
+#: ../inc/host.inc:149
 msgid "Measured floating point speed"
 msgstr "Vitesse mesurée pour les calculs en virgule flottante"
 
-#: ../inc/host.inc:150 ../inc/host.inc:153
+#: ../inc/host.inc:149 ../inc/host.inc:152
 msgid "%1 million ops/sec"
 msgstr "%1 million d'opérations/sec"
 
-#: ../inc/host.inc:153
+#: ../inc/host.inc:152
 msgid "Measured integer speed"
 msgstr "Vitesse mesurée pour les calculs en nombres entiers"
 
-#: ../inc/host.inc:157 ../inc/host.inc:159
+#: ../inc/host.inc:156 ../inc/host.inc:158
 msgid "Average upload rate"
 msgstr "Débit moyen en téléchargement ascendant"
 
-#: ../inc/host.inc:157 ../inc/host.inc:164
+#: ../inc/host.inc:156 ../inc/host.inc:163
 msgid "%1 KB/sec"
 msgstr "%1 Ko/s"
 
-#: ../inc/host.inc:159 ../inc/host.inc:166 ../inc/result.inc:216
+#: ../inc/host.inc:158 ../inc/host.inc:165 ../inc/result.inc:216
 #: ../inc/result.inc:226 ../inc/result.inc:244 ../inc/result.inc:262
 #: ../inc/result.inc:278 ../user/explain_state.php:56
 #: ../user/host_app_versions.php:30
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../inc/host.inc:164 ../inc/host.inc:166
+#: ../inc/host.inc:163 ../inc/host.inc:165
 msgid "Average download rate"
 msgstr "Débit moyen de téléchargement"
 
-#: ../inc/host.inc:169 ../user/host_app_versions.php:65
+#: ../inc/host.inc:168 ../user/host_app_versions.php:65
 msgid "Average turnaround time"
 msgstr "Temps de cycle moyen"
 
-#: ../inc/host.inc:169 ../user/forum_search.php:46 ../user/forum_search.php:47
-#: ../user/forum_search.php:48 ../user/forum_search.php:49
+#: ../inc/host.inc:168 ../user/forum_search.php:48 ../user/forum_search.php:49
+#: ../user/forum_search.php:50 ../user/forum_search.php:51
 msgid "%1 days"
 msgstr "%1 jours"
 
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
 msgstr "Détails de l'application"
 
-#: ../inc/host.inc:171
+#: ../inc/host.inc:170
 msgid "Show"
 msgstr "Afficher"
 
-#: ../inc/host.inc:181 ../inc/host.inc:336 ../inc/user.inc:152
+#: ../inc/host.inc:180 ../inc/host.inc:341 ../inc/user.inc:155
 msgid "Tasks"
 msgstr "Tâches"
 
-#: ../inc/host.inc:185 ../inc/host.inc:206
+#: ../inc/host.inc:184 ../inc/host.inc:206
 msgid "Number of times client has contacted server"
 msgstr "Nombre de fois où le client BOINC a contacté le serveur"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
 msgstr "Dernière date de contact avec le serveur"
 
-#: ../inc/host.inc:187
-#, php-format
-msgid "% of time BOINC is running"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
 msgstr "% de temps de fonctionnement de BOINC"
 
-#: ../inc/host.inc:189
-#, php-format
-msgid "While BOINC running, % of time host has an Internet connection"
+#: ../inc/host.inc:188
+msgid ""
+"While BOINC is running, fraction of time computer has an Internet connection"
 msgstr "Lorsque BOINC est en fonctionnement, % du temps où l'hôte a une connexion internet."
 
-#: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
 msgstr "Lorsque BOINC fonctionne, % de temps de travail autorisé"
 
+#: ../inc/host.inc:191
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "Lorsque BOINC fonctionne, % de temps de travail GPU autorisé"
+
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
 msgstr "Efficacité moyenne du CPU"
@@ -720,7 +824,7 @@ msgstr "Efficacité moyenne du CPU"
 msgid "Task duration correction factor"
 msgstr "Facteur de correction de durée de tâche"
 
-#: ../inc/host.inc:198 ../inc/host.inc:674
+#: ../inc/host.inc:198 ../inc/host.inc:679
 msgid "Location"
 msgstr "Localisation"
 
@@ -736,7 +840,7 @@ msgstr "Fusionner les enregistrements dupliqués de cet ordinateur"
 msgid "Merge"
 msgstr "Fusionner"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
 msgstr "Dernier contact"
 
@@ -744,30 +848,30 @@ msgstr "Dernier contact"
 msgid "Computer info"
 msgstr "Informations sur l'ordinateur"
 
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
+#: ../inc/host.inc:221 ../inc/host.inc:681 ../inc/team.inc:366
 #: ../user/top_users.php:48
 msgid "Rank"
 msgstr "Rang"
 
-#: ../inc/host.inc:225 ../inc/host.inc:679
+#: ../inc/host.inc:225 ../inc/host.inc:684
 msgid "Avg. credit"
 msgstr "Crédit moyen"
 
-#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
-#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
-#: ../inc/team.inc:368 ../inc/user.inc:139
-#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:64
-#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
+#: ../inc/host.inc:230 ../inc/team.inc:106 ../inc/team.inc:225
+#: ../inc/team.inc:234 ../inc/team.inc:236 ../inc/team.inc:372
+#: ../inc/team.inc:377 ../inc/user.inc:140
+#: ../user/team_change_founder_form.php:81 ../user/team_email_list.php:73
+#: ../user/team_remove_inactive_form.php:44 ../user/top_users.php:53
 #: ../user/top_users.php:58
 msgid "Recent average credit"
 msgstr "Crédit moyen récent"
 
-#: ../inc/host.inc:236 ../inc/host.inc:684 ../inc/result.inc:51
+#: ../inc/host.inc:236 ../inc/host.inc:689 ../inc/result.inc:51
 #: ../user/host_app_versions.php:25
 msgid "CPU"
 msgstr "CPU"
 
-#: ../inc/host.inc:237 ../inc/host.inc:685
+#: ../inc/host.inc:237 ../inc/host.inc:690
 msgid "GPU"
 msgstr "GPU"
 
@@ -775,91 +879,83 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "Système d'exploitation"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr "(%1 processeurs)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "Détails"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
 msgstr "Statistiques inter-projets :"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
 msgstr "L'hôte %1 a une durée de vie qui chevauche :"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr "L'hôte %1 a un système d'exploitation incompatible :"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr "L'hôte %1 utilise un CPU incompatible :"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
 msgstr "même hôte"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
 msgstr "Impossible de fusionner l'hôte %1 avec l'hôte %2 - ils sont incompatibles"
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr "Fusion de l'hôte %1 avec l'hôte %2 en cours"
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
 msgstr "Impossible de mettre à jour le crédit du nouvel ordinateur"
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
 msgstr "Impossible de mettre à jour les résultats"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
 msgstr "Impossible de retirer l'ancien ordinateur"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
 msgstr "L'ancien ordinateur %1 a été retiré"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "Afficher :"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
 msgstr "Tous les ordinateurs"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Only computers active in past 30 days"
 msgstr "Uniquement les ordinateurs actifs durant les 30 derniers jours"
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr "ID de l'ordinateur"
 
-#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:210
-#: ../inc/team.inc:358 ../inc/user.inc:199 ../user/account_finish.php:41
-#: ../user/create_account_form.php:79 ../user/team_admins.php:62
-#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
-#: ../user/top_users.php:49 ../user/user_search.php:139
-msgid "Name"
-msgstr "Nom"
-
-#: ../inc/host.inc:682
+#: ../inc/host.inc:687
 msgid "BOINC<br>version"
 msgstr "BOINC<br>version"
 
-#: ../inc/host.inc:745 ../user/merge_by_name.php:65
+#: ../inc/host.inc:750 ../user/merge_by_name.php:65
 msgid "Merge computers by name"
 msgstr "Fusionner les ordinateurs par le nom"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
 msgstr "Navigateur par défaut"
 
@@ -872,29 +968,29 @@ msgstr "Commentaire"
 msgid "News is available as an %sRSS feed%s"
 msgstr "Les nouvelles sont disponibles en %sflux RSS%s"
 
-#: ../inc/pm.inc:25 ../inc/pm.inc:174 ../user/pm.php:69 ../user/pm.php:148
+#: ../inc/pm.inc:25 ../inc/pm.inc:176 ../user/pm.php:69 ../user/pm.php:153
 msgid "Inbox"
 msgstr "Courrier entrant"
 
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
 msgid "Write"
 msgstr "Écrire"
 
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:458
 msgid "Send private message"
 msgstr "Envoyer un message privé"
 
 #: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
 #: ../user/ffmail_form.php:58 ../user/forum_edit.php:99
 #: ../user/forum_edit.php:101 ../user/forum_edit.php:145
-#: ../user/forum_post.php:61 ../user/forum_post.php:87
-#: ../user/forum_post.php:89 ../user/forum_post.php:130
-#: ../user/forum_reply.php:74 ../user/forum_reply.php:107
-#: ../user/forum_reply.php:109 ../user/forum_reply.php:165 ../user/pm.php:181
+#: ../user/forum_post.php:65 ../user/forum_post.php:91
+#: ../user/forum_post.php:93 ../user/forum_post.php:134
+#: ../user/forum_reply.php:77 ../user/forum_reply.php:110
+#: ../user/forum_reply.php:115 ../user/forum_reply.php:171 ../user/pm.php:186
 msgid "Preview"
 msgstr "Prévisualisation"
 
-#: ../inc/pm.inc:48 ../user/pm.php:131
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
 msgstr "message inexistant"
 
@@ -906,7 +1002,7 @@ msgstr "A"
 msgid "User IDs or unique usernames, separated with commas"
 msgstr "Identifiants utilisateurs, séparés par des virgules"
 
-#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:139
+#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:144
 msgid "Subject"
 msgstr "Sujet"
 
@@ -914,376 +1010,499 @@ msgstr "Sujet"
 msgid "Send message"
 msgstr "Envoyer message"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
 msgstr "message privé envoyé; sujet:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
 msgstr "Message privé %1 de %2, sujet:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
 msgstr "Impossible de créer le message"
 
-#: ../inc/pm.inc:166
+#: ../inc/pm.inc:168
 msgid ""
 "You are not allowed to send privates messages so often. Please wait some "
 "time before sending more messages."
 msgstr "Vous n'êtes pas autorisé à envoyer des messages privés si fréquemment. Veuillez patienter avant d'en envoyer plus."
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "non lu"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
 msgstr "Pour les notifications par email,  %1éditer les préférences de communauté%2"
 
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "Message privé"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "Les limites d'utilisation"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "Utiliser au plus"
+
+#: ../inc/prefs.inc:49
+#, no-php-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."
+
+#: ../inc/prefs.inc:52
+#, no-php-format
+msgid "% of the CPUs"
+msgstr "% du temps CPU"
+
+#: ../inc/prefs.inc:57
+#, no-php-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."
+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."
+
+#: ../inc/prefs.inc:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% du temps CPU"
+
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "Quand suspendre les calculs"
+
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "Suspension quand l'ordinateur est sur batterie"
+
+#: ../inc/prefs.inc:65
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr "Suspendre les calculs si l'ordinateur est sur batterie ? %1 Ne concerne que les ordinateurs portables %2"
+"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."
 
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
-msgstr "Suspendre les calculs lorsque l'ordinateur est utilisé ?"
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "Suspendre les calculs lorsque l'ordinateur est utilisé"
 
-#: ../inc/prefs.inc:91
+#: ../inc/prefs.inc:71
 msgid ""
-"Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr "Suspendre les calculs du GPU lorsque l'ordinateur est utilisé ? %1 Applicable depuis la version 6.6.21 et plus %2"
+"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."
+
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Suspendre le calcul par la carte graphique lorsque l'ordinateur est utilisé"
+
+#: ../inc/prefs.inc:77
+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."
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
+#: ../inc/prefs.inc:82
+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"
 
-#: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
+#: ../inc/prefs.inc:83
+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\"."
+
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
 msgid "minutes"
 msgstr "minutes"
 
-#: ../inc/prefs.inc:105
-msgid ""
-"Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
-"power mode on some computers %2"
-msgstr "Suspendre les calculs si aucune activité de la souris ou du clavier dans les dernières %1 Requis pour pouvoir basculer en mode basse consommation sur certains ordinateurs %2"
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Suspendre si pas d'utilisation souris / clavier durant "
 
-#: ../inc/prefs.inc:114
-msgid ""
-"Suspend work when non-BOINC CPU usage is above %1 0 means no "
-"restriction<br>Enforced by version 6.10.30+ %2"
-msgstr "Suspendre les calculs si l'utilisation du CPU est supérieure à %1 (0 signifie aucune restriction)<br>Applicable depuis la version 6.10.30 et plus %2"
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "Ceci permet à certains ordinateurs de se mettre en mode de consommation réduite s'ils ne sont pas utilisés."
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr "N'exécuter les calculs qu'entre les horaires de %1 Aucune restriction si égal à %2"
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Suspendre lorsque l'utilisation du processeur est au-dessus de"
 
-#: ../inc/prefs.inc:130
-msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr "Laisser les tâches en mémoire lorsqu'elles sont suspendues ? %1(les tâches suspendues consommeront de l'espace sur le swap si 'oui')%2"
+#: ../inc/prefs.inc:96
+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."
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "Permuter entre les tâches toutes les %1 Recommandé : 60 minutes %2"
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "Réaliser des calculs seulement entre"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "Sur les systèmes multiprocesseurs, utiliser au plus"
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "Autoriser les calculs seulement durant  une certaine période chaque jour."
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "processeurs"
+#: ../inc/prefs.inc:105 ../inc/prefs.inc:214
+#: ../user/forum_banishment_vote.php:70
+#: ../user/forum_banishment_vote_action.php:65
+#: ../user/forum_moderate_post.php:63 ../user/forum_moderate_thread.php:61
+msgid "Other"
+msgstr "Autre"
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr "Sur les systèmes multiprocesseurs, utiliser au plus %1 Applicable depuis la version 6.1 ou plus %2"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "Stocker au moins"
 
-#: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr "% des processeurs"
+#: ../inc/prefs.inc:108
+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."
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr "Utiliser au plus %1 Peut être utilisé pour réduire la température du CPU %2"
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "jours de travail"
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr "% du temps CPU"
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "Stocker jusqu'à un additionnel"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "Disque : utiliser au plus"
+#: ../inc/prefs.inc:114
+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."
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "Go"
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+msgstr "Permuter entre les tâches toutes les"
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr "Disque : Laisser disponible au moins %1 Les valeurs inférieures à %2 sont ignorées %3"
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "Si vous exécutez plusieurs projets, BOINC peut basculer entre les tâches à cette fréquence."
 
-#: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
-#: ../inc/prefs.inc:211
-#, php-format
-msgid "% of total"
-msgstr "% du total"
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "Demander des tâches au point de contrôle au plus chaque"
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Point de contrôle des tâches sur disque au plus tous les"
+#: ../inc/prefs.inc:126
+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."
 
-#: ../inc/prefs.inc:196
+#: ../inc/prefs.inc:128
 msgid "seconds"
 msgstr "secondes"
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "Espace d'échange (swap) : utiliser au plus"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "Ne pas utiliser plus de:"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "Mémoire : lorsque l'ordinateur est utilisé, utiliser au plus"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "Limiter la quantité totale d'espace disque utilisée par BOINC."
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "Mémoire : lorsque l'ordinateur n'est pas utilisé, utiliser au plus"
+#: ../inc/prefs.inc:139
+msgid "GB"
+msgstr "Go"
 
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr "Récupérer suffisamment de travail pour rester occupé durant au moins%1(maximum 10 jours).%Q"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "Laisser au moins"
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr "jours"
+#: ../inc/prefs.inc:143
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Limiter l'utilisation du disque dur afin de laisser suffisamment d'espace libre sur le volume où BOINC stocke les données."
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... et jusqu'à un additionnel "
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB libre"
 
-#: ../inc/prefs.inc:232
+#: ../inc/prefs.inc:149
 msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr "Confirmer avant de se connecter à internet ? %1 Utile uniquement si vous avez un modem, une connexion RNIS ou VPN %2"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "Limiter le pourcentage d'espace disque utilisée par BOINC sur le volume où il stocke les données."
 
-#: ../inc/prefs.inc:241
-msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr "Déconnecter lorsque terminé ? %1 Utile uniquement si vous avez un modem, une connexion RNIS ou VPN %2"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% du total"
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "Débit maximum de téléchargement descendant :"
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "Lorsque l'ordinateur est utilisé, utilisez au maximum"
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr "Koctets/sec"
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "Limiter la mémoire utilisée par BOINC lorsque vous utilisez l'ordinateur."
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "Débit maximum en téléchargement ascendant :"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr "Utiliser le réseau seulement entre les heures de"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "Lorsque l'ordinateur n'est pas en utilisation, utiliser au maximum"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "Transférer au plus %1 Applicable depuis version 6.10.46 et plus %2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Limiter la mémoire utilisée par BOINC lorsque vous n'utilisez pas l'ordinateur."
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "Moctets chaque"
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Laisser les tâches non-GPU en mémoire lorsqu'elles sont suspendues"
 
-#: ../inc/prefs.inc:274
+#: ../inc/prefs.inc:173
 msgid ""
-"Skip image file verification? %1 Check this ONLY if your Internet provider "
-"modifies image files (UMTS does this, for example). %2 Skipping verification"
-" reduces the security of BOINC. %3"
-msgstr "Passer la vérification du fichier image ? %1 Cochez ceci SEULEMENT si votre fournisseur Internet modifie des fichiers images (l'UMTS fait ceci, par exemple). %2 Ignorer la vérification réduit la sécurité de BOINC. %3"
+"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."
 
-#: ../inc/prefs.inc:287
-msgid ""
-"Resource share %1 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. %2"
-msgstr "Partage de ressource %1 Détermine la proportion des ressources de votre ordinateur allouées à ce projet. Exemple : si vous participez à deux projets BOINC avec un partage de ressources de 100 et 200, le premier aura 1/3 des vos ressources et le second 2/3."
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "Espace d'échange (swap) : utiliser au plus"
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr "Accélérer les tâches GPU en dédiant un core CPU à chacune ?"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Limiter l'espace d'échange utilisé par BOINC (pagefile.sys ou swap)."
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "Utiliser le CPU %1 Applicable depuis la version 6.10 et plus %2"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "Taux limite de téléchargement descendant"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "Utiliser le GPU ATI %1 Applicable depuis la version 6.10 et plus %2"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "Limiter le taux de transfert de fichiers descendant (download)."
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "Utiliser le GPU NVIDIA si présent %1 Applicable depuis la version 6.10 et plus %2"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "KB/seconde"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Utiliser le GPU Intel %1 Applicable depuis la version 7.2 et suivantes %2"
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr "Taux limite de téléchargement ascendant"
 
-#: ../inc/prefs.inc:358
-msgid ""
-"Run test applications? %1 This helps us develop applications, but may cause "
-"jobs to fail on your computer %2"
-msgstr "Lancer les applications de test ? %1 Ceci nous aide à développer les applications, mais peut engendrer des échecs de calculs sur votre ordinateur %2"
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "Limiter le taux de transferts de fichiers ascendant (upload)."
 
-#: ../inc/prefs.inc:367
-msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this "
-"address."
-msgstr "Les e-mails seront envoyés de %1. Assurez-vous que votre filtre anti-spam accepte cette adresse."
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "Limiter à"
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "Acceptez-vous que %1 et votre équipe (si vous en avez une) puisse vous envoyer des e-mails ?"
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Exemple : BOINC doit transférer au maximum 2000 MB de données tous les 30 jours."
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "Acceptez-vous que %1 affiche vos ordinateurs sur son site web ?"
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "MB chaque"
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "Utilisation disque et mémoire"
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
+msgid "days"
+msgstr "jours"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "Utilisation du processeur"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "Transférer des fichiers seulement entre"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "Utilisation du réseau"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "Transférer des fichiers uniquement pendant une période donnée chaque jour."
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr "Ces préférences s'appliquent à tous les projets BOINC auxquels vous participez."
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "Ignorer la vérification des données pour les fichiers image"
 
-#: ../inc/prefs.inc:395
+#: ../inc/prefs.inc:217
 msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of"
-" range or not numeric."
-msgstr "%1Impossible de mettre à jour les préférences.%2 Les valeurs marquées en rouge ci-dessous sont hors bornes ou non numériques."
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "Cochez si votre fournisseur d'accès Internet modifie les fichiers image.\nIgnorer cette vérification réduit la sécurité de BOINC."
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "mauvais lieu de rendez-vous : %1"
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "Confirmer avant de se connecter à internet"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "mauvais sous-ensemble : %1"
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+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."
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1025
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:85
-msgid "yes"
-msgstr "oui"
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "Se déconnecter dès que terminé"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1027
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:87
-msgid "no"
-msgstr "non"
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
+msgid "Computing"
+msgstr "Calculs en cours"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "aucune limite"
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "Disque"
 
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-msgstr "Ajouter"
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "Utilisation du réseau"
 
-#: ../inc/prefs.inc:706 ../inc/prefs.inc:834
-#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34
-msgid "Remove"
-msgstr "Supprimer"
+#: ../inc/prefs.inc:241
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "Ces préférences s'appliquent à tous les projets BOINC auxquels vous participez."
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
-msgid "Computing"
-msgstr "Calculs en cours"
+#: ../inc/prefs.inc:244
+msgid ""
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Impossible de mettre à jour les préférences.%2 Les valeurs marquées en rouge ci-dessous sont hors bornes ou non numériques."
 
-#: ../inc/prefs.inc:823
+#: ../inc/prefs.inc:483
 msgid "Separate preferences for %1"
 msgstr "Préférences séparées pour %1"
 
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
+#: ../inc/prefs.inc:493 ../inc/prefs.inc:528 ../inc/prefs_project.inc:291
 msgid "Edit preferences"
 msgstr "Modifier les préférences"
 
-#: ../inc/prefs.inc:839
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Supprimer"
+
+#: ../inc/prefs.inc:499
 msgid "Add separate preferences for %1"
 msgstr "Ajouter des préférences séparées pour %1"
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "Ces paramètres s'appliquent à tous les ordinateurs utilisant ce compte sauf "
+
+#: ../inc/prefs.inc:508
+msgid ""
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "ordinateurs où vous avez réglé les préférences localement à l'aide du BOINC Manager"
+
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Appareils Android"
+
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
 msgstr "(Basculer de vue)"
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
 msgid "Combined preferences"
 msgstr "Préférences combinées"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr "Paramètres spécifiques au projet"
-
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
 msgid "Primary (default) preferences"
 msgstr "Préférences principales (par défaut)"
 
-#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
-#: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64
-#: ../user/prefs_edit.php:92
-msgid "Edit %1 preferences"
-msgstr "Modifier les préférences de %1"
+#: ../inc/prefs.inc:537
+msgid "Preferences last modified:"
+msgstr "Dernière modification des préférences :"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr "Ceux-ci s'appliquent sur tous les projets BOINC auxquels vous participez."
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
+msgstr "Ajouter des préférences"
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
+msgstr "Mettre à jour les préférences"
+
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "oui"
+
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
+msgstr "non"
+
+#: ../inc/prefs.inc:638
+msgid "Default computer location"
+msgstr "Localisation par défaut de l'ordinateur"
+
+#: ../inc/prefs.inc:639
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr "Sur les ordinateurs participants à plusieurs projets, les préférences mises à jours le plus récemment seront utilisées."
+"New computers will use this location for computing and project preferences."
+msgstr "Les nouveaux ordinateurs utiliseront cet emplacement pour les préférences de calcul et de projet."
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr "Ces préférences ne sont pas applicables pour les appareils Android."
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Partage des ressources"
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr "Dernière modification des préférences :"
+#: ../inc/prefs_project.inc:53
+msgid ""
+"Determines the proportion of your computer's resources allocated to this "
+"project. For 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 "Détermine la proportion des ressources de votre ordinateur allouées à ce projet. Exemple : si vous participez à deux projets BOINC avec un partage de ressources de 100 et 200, le premier aura 1/3 des vos ressources et le second 2/3."
+
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Accélérer les tâches GPU en dédiant un core CPU à chacune ?"
+
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "Utiliser le CPU"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "Utiliser le GPU ATI"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "Utiliser le GPU NVIDIA"
+
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Utiliser le GPU Intel"
+
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "Exécuter les applications de test ? "
+
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "Ceci nous aide à développer les applications, mais peut générer des erreurs de calculs sur votre ordinateur"
+
+#: ../inc/prefs_project.inc:115
+msgid ""
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Les e-mails seront envoyés de %1. Assurez-vous que votre filtre anti-spam accepte cette adresse."
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "Acceptez-vous que %1 et votre équipe (si vous en avez une) puisse vous envoyer des e-mails ?"
+
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "Acceptez-vous que %1 affiche vos ordinateurs sur son site web ?"
+
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Basculer de vue)"
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr "Ajouter des préférences"
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Paramètres spécifiques au projet"
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr "Mettre à jour les préférences"
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "mauvais lieu de rendez-vous : %1"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr "Localisation par défaut de l'ordinateur"
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "mauvais sous-ensemble : %1"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "et"
 
@@ -1299,7 +1518,7 @@ msgid ""
 "people. Please change it."
 msgstr "Votre profil a été marqué comme inacceptable. Il n'est pas visible par les autres personnes. Veuillez en changer."
 
-#: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
+#: ../inc/profile.inc:172 ../user/friend.php:107 ../user/friend.php:174
 msgid "Database error"
 msgstr "Erreur de base de données"
 
@@ -1317,7 +1536,7 @@ msgstr "L'utilisateur est banni"
 msgid "No profile exists for that user ID."
 msgstr "Aucun profil n'existe pour cet ID d'utilisateur"
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
 msgstr "Éditer votre profil"
 
@@ -1365,11 +1584,12 @@ msgstr "Pas dans la base de données"
 msgid "pending"
 msgstr "en attente"
 
-#: ../inc/result.inc:114 ../user/forum_search.php:60
+#: ../inc/result.inc:114 ../user/forum_search.php:62
 msgid "All"
 msgstr "Tous"
 
 #: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
 msgid "In progress"
 msgstr "En cours"
 
@@ -1398,6 +1618,7 @@ msgid "Inactive"
 msgstr "Inactif"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
 msgstr "Non envoyé"
 
@@ -1562,127 +1783,135 @@ msgid "WU cancelled"
 msgstr "Unité de travail (WU) annulée"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "Résultats canoniques manquants"
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
 msgstr "Erreur non reconnue : %1"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Task name"
 msgstr "Nom de tâche"
 
-#: ../inc/result.inc:349 ../inc/result.inc:354 ../inc/result.inc:357
-#: ../inc/result.inc:360
+#: ../inc/result.inc:353 ../inc/result.inc:358 ../inc/result.inc:361
+#: ../inc/result.inc:364
 msgid "click for details"
 msgstr "cliquer pour voir les détails"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Show IDs"
 msgstr "Afficher les ID"
 
-#: ../inc/result.inc:354
+#: ../inc/result.inc:358
 msgid "Show names"
 msgstr "Afficher les noms"
 
-#: ../inc/result.inc:357
+#: ../inc/result.inc:361
 msgid "Task"
 msgstr "Tâche"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
 msgstr "Unité de travail (WU)"
 
-#: ../inc/result.inc:369
+#: ../inc/result.inc:373
 msgid "Computer"
 msgstr "Ordinateur"
 
-#: ../inc/result.inc:372 ../inc/result.inc:631
+#: ../inc/result.inc:376 ../inc/result.inc:635
 msgid "Sent"
 msgstr "Envoyé"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
 msgstr "Délai reporté<br/>ou date limite"
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
 msgstr "explication"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
 msgstr "État"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
 msgstr "Temps de fonctionnement<br />(sec)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr "Temps de CPU<br />(sec)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
 msgstr "Crédit"
 
-#: ../inc/result.inc:380 ../inc/result.inc:724
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:163
 msgid "Application"
 msgstr "Application"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
 msgstr "Unité de travail (WU)"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "Date limite de rapport"
+
+#: ../inc/result.inc:637
 msgid "Received"
 msgstr "Reçu"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
 msgstr "État du serveur"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
 msgstr "Résultats"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
 msgstr "État du client"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
 msgstr "État à la sortie"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "Date limite de rapport"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
 msgstr "Temps de fonctionnement"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
 msgstr "Temps de CPU"
 
-#: ../inc/result.inc:641
+#: ../inc/result.inc:645
 msgid "Validate state"
 msgstr "Valider l'état"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "FLOPS maximum de l'appareil"
+
+#: ../inc/result.inc:648
 msgid "Application version"
 msgstr "Version de l'application"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
 msgstr "Fichiers sortants"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
 msgstr "Stderr output"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "État"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
 msgstr "Nom de la tâche:"
 
@@ -1698,17 +1927,7 @@ msgstr "Mots clefs"
 msgid "Find teams with these words in their names or descriptions"
 msgstr "Trouver des équipes dont le nom ou la description contiennent ces mots clefs"
 
-#: ../inc/team.inc:43 ../inc/team.inc:122 ../inc/team.inc:233
-#: ../inc/team.inc:373 ../inc/team.inc:455 ../inc/user.inc:205
-#: ../inc/user.inc:317 ../user/account_finish.php:45
-#: ../user/create_account_form.php:98 ../user/edit_user_info_form.php:38
-#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
-#: ../user/team_search.php:72 ../user/top_users.php:63
-#: ../user/user_search.php:53 ../user/user_search.php:140
-msgid "Country"
-msgstr "Pays"
-
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:468
 msgid "Type of team"
 msgstr "Type d'équipe"
 
@@ -1716,7 +1935,7 @@ msgstr "Type d'équipe"
 msgid "Show only active teams"
 msgstr "Ne montrer que les équipes actives"
 
-#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:78 ../user/user_search.php:70
 msgid "Search"
 msgstr "Recherche"
 
@@ -1736,8 +1955,8 @@ msgstr "Vous l'avez requis"
 msgid "founder response deadline is %1"
 msgstr "la date limite de réponse du fondateur est %1"
 
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
+#: ../inc/team.inc:72 ../inc/team.inc:570 ../inc/user.inc:358
+#: ../inc/user.inc:449
 msgid "None"
 msgstr "Aucun(e)"
 
@@ -1753,486 +1972,477 @@ msgstr "Différé(e)"
 msgid "Team info"
 msgstr "Info équipe"
 
-#: ../inc/team.inc:89 ../user/team_forum.php:70 ../user/team_search.php:69
+#: ../inc/team.inc:89 ../user/team_forum.php:72 ../user/team_search.php:82
 msgid "Description"
 msgstr "Description"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:101
 msgid "Web site"
 msgstr "Site web"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:127
 msgid "Cross-project stats"
 msgstr "Statistiques inter-projets"
 
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:130 ../inc/team.inc:383 ../user/team_search.php:84
 msgid "Type"
 msgstr "Type"
 
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:134 ../user/team_manage.php:65
 msgid "Message board"
 msgstr "Forum"
 
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:135 ../user/forum_forum.php:138 ../user/forum_index.php:98
 msgid "Threads"
 msgstr "Sujets"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:143
 msgid "Join this team"
 msgstr "Rejoindre cette équipe"
 
-#: ../inc/team.inc:137
+#: ../inc/team.inc:144
 msgid ""
 "Note: if 'OK to email' is set in your project preferences, joining a team "
 "gives its founder access to your email address."
 msgstr "Note : si 'OK to email' est choisi dans vos préférences de projets, le fait de rejoindre une équipe, donnera accès à votre adresse email à son fondateur."
 
-#: ../inc/team.inc:140
+#: ../inc/team.inc:147
 msgid "Not accepting new members"
 msgstr "N'accepte pas de nouveaux membres"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:154
 msgid "Foundership change requested"
 msgstr "Changement de fondateur demandé"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:155
 msgid "Respond by %1"
 msgstr "Répondre par %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:159
 msgid "Team foundership change"
 msgstr "Changement de fondateur de l'équipe"
 
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:163 ../inc/team.inc:368
 msgid "Members"
 msgstr "Membres"
 
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:164 ../inc/team.inc:263
 msgid "Founder"
 msgstr "Fondateur"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:178
 msgid "Admins"
 msgstr "Administrateurs"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:193
 msgid "New members in last day"
 msgstr "Nouveaux membres de la veille"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:194
 msgid "Total members"
 msgstr "Membres totaux"
 
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:194 ../inc/team.inc:195 ../inc/team.inc:196
 msgid "view"
 msgstr "voir"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:195
 msgid "Active members"
 msgstr "Membres actifs"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:196
 msgid "Members with credit"
 msgstr "Membres avec du crédit"
 
-#: ../inc/team.inc:256
+#: ../inc/team.inc:265
 msgid "Admin"
 msgstr "Administrateur"
 
-#: ../inc/team.inc:277 ../user/forum_user_posts.php:122
-#: ../user/top_hosts.php:93 ../user/top_teams.php:121
-#: ../user/top_users.php:127
+#: ../inc/team.inc:286 ../user/forum_user_posts.php:124
+#: ../user/top_hosts.php:93 ../user/top_teams.php:123
+#: ../user/top_users.php:128
 msgid "Previous %1"
 msgstr "%1 précédent"
 
-#: ../inc/team.inc:281 ../user/forum_user_posts.php:131
-#: ../user/profile_search_action.php:61 ../user/top_hosts.php:98
-#: ../user/top_teams.php:126 ../user/top_users.php:132
+#: ../inc/team.inc:290 ../user/forum_user_posts.php:133
+#: ../user/profile_search_action.php:63 ../user/top_hosts.php:98
+#: ../user/top_teams.php:128 ../user/top_users.php:133
 msgid "Next %1"
 msgstr "Prochains %1"
 
-#: ../inc/team.inc:289
+#: ../inc/team.inc:298
 msgid "No such team."
 msgstr "Pas de telle équipe."
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:311
 msgid "This operation requires foundership."
 msgstr "Cette opération requiert d'être fondateur."
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:335
 msgid "This operation requires team admin privileges"
 msgstr "Cette opération requiert les privilèges d'administrateur de l'équipe"
 
-#: ../inc/team.inc:422
+#: ../inc/team.inc:437
 msgid ""
 "WARNING: this is a BOINC-wide team. If you make changes here, they will soon"
 " be overwritten. Edit the %1BOINC-wide team%2 instead."
 msgstr "ATTENTION : ceci est une équipe regroupant tout BOINC. Si vous faites des modifications ici, elles seront écrasées rapidement. A la place, éditez %1l'équipe globale BOINC%2."
 
-#: ../inc/team.inc:428
+#: ../inc/team.inc:443
 msgid ""
 "%1Privacy note%2: if you create a team, your project preferences (resource "
 "share, graphics preferences) will be visible to the public."
 msgstr "%1Confidentialité%2: si vous créez une équipe, vos préférences (partage de ressources, préférences graphiques) deviendront publiques."
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
 msgstr "Nom de l'équipe, version texte"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:448
 msgid "Don't use HTML tags."
 msgstr "Ne pas utiliser de balises HTML."
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
 msgstr "Nom de l'équipe, version HTML"
 
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:453 ../inc/team.inc:463
 msgid "You may use %1limited HTML tags%2."
 msgstr "Vous pouvez utiliser %1certaines balises HTML%2."
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
 msgstr "Si vous ne connaissez pas HTML, laissez cette zone vide."
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
 msgstr "URL de l'équipe si disponible"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "without \"http://\""
 msgstr "sans \"http://\""
 
-#: ../inc/team.inc:443
+#: ../inc/team.inc:458
 msgid "This URL will be linked to from the team's page on this site."
 msgstr "La page de l'équipe sur ce site pointera sur cette URL."
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:461
 msgid "Description of team"
 msgstr "Description de l'équipe"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:477
 msgid "Accept new members?"
 msgstr "Accepte des nouveaux membres ?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
 msgstr "Profil utilisateur"
 
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
 msgstr "Projets auxquels vous participez"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
 msgstr "Projets auxquels %1 participe"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Project"
 msgstr "Projet"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Click for user page"
 msgstr "Cliquer pour voir la page utilisateur"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
 msgstr "Depuis"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
 msgstr "Calculs et crédits"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
 msgstr "Ordinateurs de ce compte"
 
-#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
-#: ../user/view_profile.php:64
+#: ../inc/user.inc:154 ../inc/user.inc:155 ../inc/user.inc:233
+#: ../inc/user.inc:312 ../inc/user.inc:407 ../inc/user.inc:482
+#: ../user/view_profile.php:66
 msgid "View"
 msgstr "Voir"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
 msgstr "Identifiant inter-projets"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
 msgstr "Statistiques inter-projets"
 
-#: ../inc/user.inc:163
+#: ../inc/user.inc:166
 msgid "Account"
 msgstr "Compte"
 
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:168 ../inc/user.inc:358 ../inc/user.inc:447
+#: ../inc/user.inc:449 ../user/user_search.php:124
 msgid "Team"
 msgstr "Equipe"
 
-#: ../inc/user.inc:167
+#: ../inc/user.inc:170
 msgid "Cross-project"
 msgstr "Inter-projets"
 
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
+#: ../inc/user.inc:171
 msgid "Certificate"
 msgstr "Certificat"
 
-#: ../inc/user.inc:169
+#: ../inc/user.inc:172
 msgid "Stats on your cell phone"
 msgstr "Statistiques sur votre téléphone mobile"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr "Type de notification inconnue: %1"
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
 msgstr "Informations de compte"
 
-#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
-#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
+#: ../inc/user.inc:206 ../user/get_passwd.php:31
+#: ../user/team_email_list.php:73
 msgid "Email address"
 msgstr "Adresse email"
 
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:210 ../inc/user.inc:400
 msgid "URL"
 msgstr "URL"
 
-#: ../inc/user.inc:206
+#: ../inc/user.inc:213
 msgid "Postal code"
 msgstr "Code postal"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
 msgstr "%1 membre depuis"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
 msgstr "Changer"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
 msgstr "adresse email"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
 msgstr "mot de passe"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
 msgstr "autres informations"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
 msgstr "Identifiant utilisateur"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
 msgstr "Utilisé par les fonctionnalités de communauté"
 
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "Clés de compte"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
 msgstr "Quand et comment BOINC utilise votre ordinateur"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
 msgstr "Préférences de calcul"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
 msgstr "Forums et messages privés"
 
-#: ../inc/user.inc:229 ../user/edit_forum_preferences_form.php:31
+#: ../inc/user.inc:245 ../user/edit_forum_preferences_form.php:31
 msgid "Community preferences"
 msgstr "Préférences de communauté"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
 msgstr "Préférences pour ce projet"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
 msgstr "Préférences de %1"
 
-#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../inc/user.inc:266
+msgid "View the profile of %1"
+msgstr "Consulter le profil de %1"
+
+#: ../inc/user.inc:267 ../inc/user.inc:316 ../inc/user.inc:482
+msgid "Profile"
+msgstr "Profil"
+
+#: ../inc/user.inc:307 ../user/sample_index.php:114
 msgid "Community"
 msgstr "Communauté"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr "Supprimer"
-
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "Créer"
 
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
-msgid "Profile"
-msgstr "Profil"
-
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:321 ../inc/user.inc:454
 msgid "%1 posts"
 msgstr "%1 messages"
 
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:339 ../user/edit_forum_preferences_form.php:40
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../inc/user.inc:269
+#: ../inc/user.inc:346
 msgid "Quit team"
 msgstr "Quitter l'équipe"
 
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:348 ../inc/user.inc:365
 msgid "Administer"
 msgstr "Administrer"
 
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:354 ../inc/user.inc:367
 msgid "(foundership change request pending)"
 msgstr "(demande de changement de fondateur en cours)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
 msgstr "Membre de l'équipe"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
 msgstr "trouver une équipe"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
 msgstr "Fondateur mais non membre de"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
 msgstr "Trouver des amis"
 
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
+#: ../inc/user.inc:383 ../inc/user.inc:385 ../inc/user.inc:465
+#: ../inc/user.inc:467 ../inc/user.inc:476
 msgid "Friends"
 msgstr "Amis"
 
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
+#: ../inc/user.inc:407 ../inc/user.inc:409 ../user/server_status.php:153
 msgid "Computers"
 msgstr "Ordinateurs"
 
-#: ../inc/user.inc:338
+#: ../inc/user.inc:415
 msgid "Donor"
 msgstr "Donateur"
 
-#: ../inc/user.inc:378
+#: ../inc/user.inc:458
 msgid "Contact"
 msgstr "Contacter"
 
-#: ../inc/user.inc:381
+#: ../inc/user.inc:461
 msgid "This person is a friend"
 msgstr "Cette personne est un(e) ami(e)"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
 msgstr "Annuler l'amitié"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
 msgstr "Requête en cours"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
 msgstr "Ajouter en tant qu'ami(e)"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
 msgstr "le nom d'utilisateur ne peut contenir d'espace au début ou à la fin"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
 msgstr "le nom d'utilisateur ne doit pas être vide"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
 msgstr "le nom d'utilisateur ne peut pas contenir de balises HTML"
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
 msgstr "déconnexion"
 
-#: ../inc/util.inc:133
+#: ../inc/util.inc:163
 msgid "log in"
 msgstr "connexion"
 
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
-msgid "Log in"
-msgstr "Connexion"
-
-#: ../inc/util.inc:205 ../user/create_account_form.php:40
+#: ../inc/util.inc:239 ../user/create_account_form.php:41
 msgid "Create an account"
 msgstr "Créer un compte"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
 msgstr "État du serveur"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
 msgstr "Une erreur de base de données s'est produite durant le traitement de votre demande ; veuillez réessayer ultérieurement."
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
 msgstr "Impossible de traiter la requête"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
 msgstr "heures"
 
-#: ../inc/util.inc:280
+#: ../inc/util.inc:309
 msgid "min"
 msgstr "min"
 
-#: ../inc/util.inc:283
+#: ../inc/util.inc:312
 msgid "sec"
 msgstr "sec"
 
-#: ../inc/util.inc:444
+#: ../inc/util.inc:473
 msgid ""
 "Link has timed out. Please click Back, refresh the page, and try again."
 msgstr "Expiration du délai. Veuillez cliquer Retour, rafraîchissez la page et réessayez."
 
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "Consulter le profil de %1"
-
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr "Utiliser les balises BBCode pour mettre votre texte en forme"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
 msgstr "Le projet est arrêté pour cause de maintenance."
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
 msgstr "%1 est temporairement arrêté pour cause de maintenance. Veuillez réessayer ultérieurement."
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
 msgstr "Impossible de se connecter à la base de données - veuillez réessayer ultérieurement."
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
 msgstr "Impossible d'interroger la base de données - veuillez réessayer ultérieurement"
 
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "caractères restants"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
 msgstr "Rester connecté sur cet ordinateur"
 
@@ -2240,22 +2450,6 @@ msgstr "Rester connecté sur cet ordinateur"
 msgid "Finish account setup"
 msgstr "Terminer le paramétrage du compte"
 
-#: ../user/account_finish.php:41 ../user/create_account_form.php:79
-msgid "Identifies you on our web site. Use your real name or a nickname."
-msgstr "Vous identifie sur notre site web. Utilisez votre nom réel ou un pseudonyme."
-
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
-msgid "Select the country you want to represent, if any."
-msgstr "Le cas échéant, choisissez le pays que vous représenteriez."
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Postal or ZIP Code"
-msgstr "Code postal"
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Optional"
-msgstr "Facultatif"
-
 #: ../user/account_finish_action.php:27
 msgid "You must supply a name for your account"
 msgstr "Vous devez fournir un nom pour votre compte."
@@ -2264,34 +2458,38 @@ msgstr "Vous devez fournir un nom pour votre compte."
 msgid "HTML tags not allowed in name"
 msgstr "Les balises HTML ne sont pas autorisées dans le nom."
 
-#: ../user/add_venue.php:81
+#: ../user/add_venue.php:40 ../user/add_venue.php:64 ../user/prefs_edit.php:41
+#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+msgid "Edit %1 preferences"
+msgstr "Modifier les préférences de %1"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr "Ajouter %1 préférences pour %2"
 
-#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
+#: ../user/apps.php:31 ../user/sample_index.php:104
 msgid "Applications"
 msgstr "Applications"
 
-#: ../user/apps.php:33
+#: ../user/apps.php:32
 msgid ""
 "%1 currently has the following applications. When you participate in %1, "
-"work for one or more of these applications will be assigned to your "
+"tasks for one or more of these applications will be assigned to your "
 "computer. The current version of the application will be downloaded to your "
 "computer. This happens automatically; you don't have to do anything."
 msgstr "%1 dispose actuellement des applications suivantes. Lorsque vous participez à %1, du travail pour une de ces applications ou plus sera attribué à votre ordinateur. La version courante de l'application sera téléchargée par votre ordinateur. Tout se passe automatiquement, vous n'avez rien à faire."
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "Plateforme"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
 msgstr "Version"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "Date d'installation"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "Calcul moyen"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2322,153 +2520,79 @@ msgid "Underline"
 msgstr "Souligné"
 
 #: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "Barré"
+
+#: ../user/bbcode.php:36
 msgid "Superscript"
 msgstr "Exposant"
 
-#: ../user/bbcode.php:36
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "Texte long"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
 msgstr "Texte en rouge"
 
-#: ../user/bbcode.php:38
+#: ../user/bbcode.php:39
 msgid "link to website"
 msgstr "Lien vers le site Web"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "Quoted text"
 msgstr "Texte cité"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
 msgstr "utiliser pour citer des blocs de texte"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
 msgstr "utiliser pour afficher une image"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
 msgstr "Extrait de code ici"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
 msgstr "utiliser pour afficher du code"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
 msgstr "Texte pré-formaté"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
 msgstr "utiliser pour afficher du texte pré-formaté (habituellement monospace)"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
 msgstr "Objet 1"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
 msgstr "Objet 2"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
 msgstr "Objet 2"
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
 msgstr "utiliser pour renvoyer sur la gestion de tickets sur le site BOINCE"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "utiliser pour renvoyer sur le wiki Trac sur le site BOINC"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "utiliser pour renvoyer sur SVN gestion des changements sur le site BOINC"
-
-#: ../user/bbcode.php:53
+#: ../user/bbcode.php:52
 msgid ""
 "If you don't close a tag or don't specify a parameter correctly,\n"
 "the raw tag itself will display instead of the formatted text."
 msgstr "Si vous ne fermez pas une balise ou ne spécifiez pas correctement un paramètre, \nle texte même de la balise sera affiché et non le texte formaté."
 
-#: ../user/bs_sample_index.php:44
-msgid "Participants"
-msgstr "Participants"
-
-#: ../user/bs_sample_index.php:46
-msgid "Do work"
-msgstr "Faire le travail"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-#: ../user/home.php:49 ../project.sample/project.inc:43
-msgid "Your account"
-msgstr "Votre compte"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-msgid "view stats, modify preferences"
-msgstr "afficher des statistiques, modifier les préférences"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-#: ../user/team.php:25
-msgid "Teams"
-msgstr "Equipes"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-msgid "create or join a team"
-msgstr "créer ou rejoindre une équipe"
-
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
-msgid "User of the day"
-msgstr "Utilisateur du jour"
-
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-msgid "Server status"
-msgstr "État du serveur"
-
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
-msgid "Profiles"
-msgstr "Profils"
-
-#: ../user/bs_sample_index.php:61
-msgid "User search"
-msgstr "Recherche d'utilisateur"
-
-#: ../user/bs_sample_index.php:64
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: ../user/bs_sample_index.php:65 ../user/stats.php:30
-#: ../user/top_users.php:116
-msgid "Top participants"
-msgstr "Top des participants"
-
-#: ../user/bs_sample_index.php:66 ../user/stats.php:31
-msgid "Top computers"
-msgstr "Top des ordinateurs"
-
-#: ../user/bs_sample_index.php:67 ../user/stats.php:32 ../user/team.php:46
-msgid "Top teams"
-msgstr "Top des équipes"
-
-#: ../user/bs_sample_index.php:68 ../user/gpu_list.php:182
-#: ../user/stats.php:33
-msgid "Top GPU models"
-msgstr "Meilleurs modèles GPU"
-
-#: ../user/bs_sample_index.php:70
-msgid "Languages"
-msgstr "Langues"
-
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "Lisez nos règles et lignes de conduite"
-
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
 msgstr "Impossible de créer le compte "
@@ -2477,192 +2601,152 @@ msgstr "Impossible de créer le compte "
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr "Cliquer sur le bouton <b>Retour</b> de votre navigateur pour essayer à nouveau."
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
 msgstr "Votre réponse ReCaptcha est incorrecte.  Veuillez réessayer."
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
 msgstr "Vous devez fournir un code d'invitation pour pouvoir créer un compte."
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
 msgstr "Le code d'invitation que vous avez fourni n'est pas valide."
 
-#: ../user/create_account_action.php:84
+#: ../user/create_account_action.php:83
 msgid ""
 "Invalid email address: you must enter a valid address of the form "
 "name at domain"
 msgstr "Adresse email invalide : vous devez entrer une adresse valide de type 'nom at domaine'."
 
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:87
 msgid "There's already an account with that email address."
 msgstr "Il y a déjà un compte avec cette adresse mail."
 
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:93 ../user/edit_passwd_action.php:32
 msgid "New passwords are different"
 msgstr "Les nouveaux mots de passe sont différents "
 
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:100 ../user/edit_passwd_action.php:40
 msgid "Passwords may only include ASCII characters."
 msgstr "Les mots de passe peuvent seulement contenir des caractères ASCII."
 
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:105 ../user/edit_passwd_action.php:44
 msgid "New password is too short: minimum password length is %1 characters."
 msgstr "Le nouveau mot de passe est trop court : la longueur minimale du mot de passe est de %1 caractères."
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
 msgstr "Impossible de créer le compte "
 
-#: ../user/create_account_form.php:44
+#: ../user/create_account_form.php:45
 msgid ""
 "NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
 "select Add Project, and enter an email address and password."
 msgstr "NOTE: Si vous utilisez le BOINC Manager ne pas utiliser ce formulaire. Exécutez BOINC, choisissez Ajouter un projet puis entrer votre adresse email et mot de passe."
 
-#: ../user/create_account_form.php:61
+#: ../user/create_account_form.php:57
 msgid ""
 "This account will belong to the team %1 and will have the project "
 "preferences of its founder."
 msgstr "Ce compte fera partie de l'équipe %1 et aura les préférences de son fondateur."
 
-#: ../user/create_account_form.php:73
-msgid "Invitation Code"
-msgstr "Code d'invitation"
-
-#: ../user/create_account_form.php:73
-msgid "A valid invitation code is required to create an account."
-msgstr "Un code d'invitation valide est requis pour créer un compte."
-
-#: ../user/create_account_form.php:83
-msgid "Email Address"
-msgstr "Adresse email"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "Doit être une adresse valide de type 'nom at domaine'."
-
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../user/create_account_form.php:93
-msgid "Must be at least %1 characters"
-msgstr "%1 caractères au moins"
-
-#: ../user/create_account_form.php:96
-msgid "Confirm password"
-msgstr "Confirmation du mot de passe"
-
-#: ../user/create_account_form.php:113
-msgid "Please enter the words shown in the image"
-msgstr "Veuillez saisir les mots affichés sur l'image."
-
-#: ../user/create_account_form.php:119
-msgid "Create account"
-msgstr "Création de compte"
-
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
 msgstr "Image"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
 msgstr "%1 Votre image de profil s'affiche à gauche."
 
-#: ../user/create_profile.php:66
+#: ../user/create_profile.php:68
 msgid ""
 "To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
 " or less)."
 msgstr "Pour la remplacer, cliquez sur le bouton \"Parcourir\" et sélectionnez un fichier JPEG ou PNG (%1 ou moins)."
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
 msgstr "Cochez cette case pour la supprimer de votre profil : "
 
-#: ../user/create_profile.php:77
+#: ../user/create_profile.php:79
 msgid ""
 "If you would like include a picture with your profile, click the \"Browse\" "
 "button and select a JPEG or PNG file. Please select images of %1 or less."
 msgstr "Pour inclure une image, cliquez sur le bouton \"Parcourir\" et sélectionnez un fichier JPEG ou PNG. Veuillez choisir une image de %1 ou moins."
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
 msgstr "Langue"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
 msgstr "Sélectionnez la langue de votre profil : "
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
 msgstr "Soumettre le profil"
 
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr "Veuillez saisir les mots affichés sur l'image."
-
-#: ../user/create_profile.php:115
+#: ../user/create_profile.php:112
 msgid "Create/edit profile"
 msgstr "Création/édition du profil"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
 msgstr "Le format de l'image que vous avez envoyé n'est pas supporté."
 
-#: ../user/create_profile.php:166
+#: ../user/create_profile.php:163
 msgid ""
 "Your %1profile%2 lets you share your opinions and background with the %3 "
 "community."
 msgstr "Votre %1profil%2 vous permet de partager vos opinions et votre vécu avec la communauté %3."
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
 msgstr "Votre réponse ReCaptcha est incorrecte.  Veuillez réessayer."
 
-#: ../user/create_profile.php:222
+#: ../user/create_profile.php:218
 msgid ""
 "Your first response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "Votre première réponse a été marquée comme spam par le système Akismet.  Veuillez modifier votre texte et réessayer."
 
-#: ../user/create_profile.php:230
+#: ../user/create_profile.php:226
 msgid ""
 "Your second response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "Votre deuxième réponse a été marquée comme spam par le système Akismet.  Veuillez modifier votre texte et réessayer."
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
 msgstr "Votre profil est vide."
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
 msgstr "Impossible de mettre le profil à jour : erreur de base de données"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
 msgstr "Impossible de créer le profil : erreur de base de données"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
 msgstr "Profil sauvegardé"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
 msgstr "Félicitations ! Votre profil a été créé avec succès dans notre base de données."
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
 msgstr "%1Voir votre profil%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
 msgstr "Créer un profil"
 
-#: ../user/create_profile.php:343
+#: ../user/create_profile.php:339
 msgid ""
 "To prevent spam, an average credit of %1 or greater is required to create or"
 " edit a profile.  We apologize for this inconvenience."
@@ -2703,9 +2787,9 @@ msgstr "Ceci ne peut pas être annulé.\nUne fois votre compte supprimé, vous n
 msgid "Are you sure you want to delete your account?"
 msgstr "Êtes-vous sûr de vouloir supprimer votre compte ? "
 
-#: ../user/delete_account.php:79 ../user/delete_profile.php:52
-#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238
-#: ../user/prefs_remove.php:52 ../user/user_search.php:59
+#: ../user/delete_account.php:79 ../user/delete_profile.php:54
+#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:240
+#: ../user/prefs_remove.php:53 ../user/user_search.php:59
 #: ../user/user_search.php:64
 msgid "Yes"
 msgstr "Oui"
@@ -2714,8 +2798,8 @@ msgstr "Oui"
 msgid "Delete this account"
 msgstr "Supprimer ce compte"
 
-#: ../user/delete_account.php:80 ../user/delete_profile.php:53
-#: ../user/friend.php:239 ../user/user_search.php:58
+#: ../user/delete_account.php:80 ../user/delete_profile.php:55
+#: ../user/friend.php:241 ../user/user_search.php:58
 #: ../user/user_search.php:63
 msgid "No"
 msgstr "Non"
@@ -2724,44 +2808,44 @@ msgstr "Non"
 msgid "Do not delete this account"
 msgstr "Ne pas supprimer ce compte"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
 msgstr "Impossible de supprimer le profil - veuillez réessayer ultérieurement."
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "Confirmation de la suppression"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
 msgstr "Votre profil a été supprimé. "
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
 msgstr "Confirmation de la suppression du profil"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
 
-#: ../user/delete_profile.php:44
+#: ../user/delete_profile.php:46
 msgid ""
 "Deleted profiles are gone forever and cannot be recovered --\n"
 "you will have to start from scratch\n"
 "if you want another profile in the future."
 msgstr "Les profils supprimés ne peuvent plus être récupérés --\nvous devrez tout recommencer si vous voulez \nun nouveau profil par la suite."
 
-#: ../user/delete_profile.php:48
+#: ../user/delete_profile.php:50
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
 msgstr "Si vous êtes sûr, cliquez sur 'Oui'\npour supprimer votre profil de notre base de données."
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
 msgstr "Supprimer mon profil"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
 msgstr "Ne pas supprimer mon profil"
 
@@ -2942,241 +3026,201 @@ msgstr "Cette action va supprimer tout changement fait dans vos préférence de
 msgid "Reset preferences"
 msgstr "Réinitialiser les préférences"
 
-#: ../user/edit_forum_preferences_action.php:88
+#: ../user/edit_forum_preferences_action.php:95
 msgid "Error: Not the right kind of file, only PNG and JPEG are supported."
 msgstr "Erreur : mauvais format de fichier, seuls les PNG et les JPEG sont supportés."
 
-#: ../user/edit_forum_preferences_action.php:114
+#: ../user/edit_forum_preferences_action.php:120
 msgid "Your signature was too long, please keep it less than 250 characters."
 msgstr "Votre signature est trop longue, maximum 250 caractères."
 
-#: ../user/edit_forum_preferences_action.php:132
-#: ../user/edit_forum_preferences_action.php:146
+#: ../user/edit_forum_preferences_action.php:139
+#: ../user/edit_forum_preferences_action.php:153
 msgid "No such user: %1"
 msgstr "Utilisateur inexistant: %1"
 
-#: ../user/edit_forum_preferences_form.php:56
+#: ../user/edit_forum_preferences_form.php:45
 msgid ""
 "How should we notify you of new private messages, friend requests, posts in "
 "subscribed threads, and other events?"
 msgstr "Comment devons vous vous notifier de nouveaux messages privés, demandes d'amitié, messages publiés dans vos sujets suivis, et autres évènements ?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
 msgstr "Sur ma page de compte (pas de mail)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
 msgstr "Immédiatement, par email"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
 msgstr "Dans un mail récapitulatif journalier"
 
-#: ../user/edit_forum_preferences_form.php:75
+#: ../user/edit_forum_preferences_form.php:65
 msgid "Message-board identity"
 msgstr "Identité sur le Forum"
 
-#: ../user/edit_forum_preferences_form.php:76
+#: ../user/edit_forum_preferences_form.php:66
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../user/edit_forum_preferences_form.php:77
+#: ../user/edit_forum_preferences_form.php:67
 msgid "An image representing you on the message boards."
 msgstr "Une image qui vous représente sur le forum."
 
-#: ../user/edit_forum_preferences_form.php:78
+#: ../user/edit_forum_preferences_form.php:68
 msgid "Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels"
 msgstr "Format: JPG ou PNG. Taille : au plus 4 Ko, 100x100 pixels."
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
 msgstr "Ne pas utiliser d'avatar."
 
-#: ../user/edit_forum_preferences_form.php:82
+#: ../user/edit_forum_preferences_form.php:72
 msgid "Use a Globally Recognized Avatar provided by %1"
 msgstr "Utiliser un Avatar Global fourni par %1"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
 msgstr "Utiliser cet avatar téléchargé :"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
 msgstr "Prévisualisation de l'avatar"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
 msgstr "Votre avatar sera vu comme ceci"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
 msgstr "Signature pour les messages sur le forum"
 
-#: ../user/edit_forum_preferences_form.php:99
+#: ../user/edit_forum_preferences_form.php:89
 msgid ""
 "Check out %1various free services%2\n"
 "<br> providing dynamic 'signature images'\n"
 "<br> showing your latest credit info, project news, etc."
 msgstr "Essayez divers %1services gratuits%2<br> \noffrant des images de signature dynamique<br> \nmontrant vos statistiques, des nouvelles des projets, etc."
 
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr "caractères restants"
-
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
 msgstr "Attacher la signature par défaut"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
 msgstr "Prévisualiser la signature"
 
-#: ../user/edit_forum_preferences_form.php:109
+#: ../user/edit_forum_preferences_form.php:97
 msgid "This is how your signature will look in the forums"
 msgstr "Voici à quoi ressemblera votre signature sur les forums"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "Affichage de message"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
 msgstr "Ce qu'il faut afficher"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
 msgstr "Cacher les images d'avatars"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
 msgstr "Cacher les signatures"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
 msgstr "Montrer les images sous forme de liens"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
 msgstr "Ouvrir les liens dans une nouvelle fenêtre / onglet"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
 msgstr "Mettre en avant les utilisateurs spéciaux"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
 msgstr "Affichez ce nombre de messages par page"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
 msgstr "Comment trier"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "Sujets:"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "Messages:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
 msgstr "Aller au premier nouveau message dans le sujet automatiquement"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
 msgstr "Ne pas déplacer les messages épinglés en haut"
 
-#: ../user/edit_forum_preferences_form.php:148
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
 msgstr "Filtre de messages"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
 msgstr "Utilisateurs filtrés"
 
-#: ../user/edit_forum_preferences_form.php:165
+#: ../user/edit_forum_preferences_form.php:154
 msgid "Ignore message board posts and private messages from these users."
 msgstr "Ignorer les messages du forum et les messages privés de ces utilisateurs."
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
 msgstr "ID Utilisateur (par exemple : 123456789)"
 
-#: ../user/edit_forum_preferences_form.php:168 ../user/pm.php:251
+#: ../user/edit_forum_preferences_form.php:157 ../user/pm.php:256
 msgid "Add user to filter"
 msgstr "Ajouter un utilisateur au filtre"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
 msgstr "Cliquer ici pour mettre à jour les préférences"
 
-#: ../user/edit_forum_preferences_form.php:175
-#: ../user/edit_forum_preferences_form.php:177
+#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:166
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: ../user/edit_forum_preferences_form.php:176
+#: ../user/edit_forum_preferences_form.php:165
 msgid "Or click here to reset preferences to the defaults"
 msgstr "Ou cliquer ici pour réinitialiser les préférences avec les valeurs par défaut"
 
 #: ../user/edit_passwd_action.php:50
-msgid "Invalid account key"
-msgstr "Clé de compte invalide"
-
-#: ../user/edit_passwd_action.php:55
-msgid "No account with that email address was found"
-msgstr "Aucun compte avec cet adresse email n'a été trouvé"
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "Mot de passe incorrect"
-
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
-msgid "Change password"
-msgstr "Modifier le mot de passe"
-
-#: ../user/edit_passwd_action.php:67
-msgid "Your password has been changed."
-msgstr "Votre mot de passe a été changé."
-
-#: ../user/edit_passwd_action.php:69
 msgid ""
 "We can't update your password due to a database problem. Please try again "
 "later."
 msgstr "Impossible de mettre à jour votre mot de passe à cause d'un problème de base de données - veuillez réessayer ultérieurement."
 
-#: ../user/edit_passwd_form.php:39
-msgid "You can identify yourself using either"
-msgstr "Vous pouvez vous identifier en utilisant soit"
-
-#: ../user/edit_passwd_form.php:41
-msgid "your email address and old password"
-msgstr "votre adresse email et l'ancien mot de passe"
-
-#: ../user/edit_passwd_form.php:42
-msgid "your account key"
-msgstr "Clef de compte"
-
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr "Mot de passe actuel"
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr "<b>OU</b> : clef de compte"
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
+msgid "Change password"
+msgstr "Modifier le mot de passe"
 
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr "Recevoir la clef de compte par email"
+#: ../user/edit_passwd_action.php:54
+msgid "Your password has been changed."
+msgstr "Votre mot de passe a été changé."
 
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
 msgstr "Nouveau mot de passe (vérification)"
 
@@ -3387,19 +3431,19 @@ msgstr "Utilisez la bouton Retour de votre navigateur pour revenir au formulaire
 msgid "Sending emails"
 msgstr "Envoi d'emails en cours"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr "email envoyé avec succès à %1"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr "échec de l'envoi de l'email de %1: %2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr "Merci d'avoir parlé à vos amis de %1"
 
-#: ../user/ffmail_action.php:94
+#: ../user/ffmail_action.php:92
 msgid ""
 "You forgot to enter your friends' names and/or email addresses; Please "
 "%1return to the form%2 and enter them."
@@ -3450,79 +3494,73 @@ msgstr "Ajoutez un message optionnel ici : "
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../user/forum_banishment_vote.php:35
-#: ../user/forum_banishment_vote_action.php:33
+#: ../user/forum_banishment_vote.php:37
+#: ../user/forum_banishment_vote_action.php:35
 msgid "You are not authorized to banish users."
 msgstr "Vous n'êtes pas autorisé à bannir des utilisateurs."
 
-#: ../user/forum_banishment_vote.php:41 ../user/forum_banishment_vote.php:46
+#: ../user/forum_banishment_vote.php:43 ../user/forum_banishment_vote.php:48
 msgid "Banishment Vote"
 msgstr "Vote de bannissement "
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
 msgstr "Aucun utilisateur trouvé avec cet ID."
 
-#: ../user/forum_banishment_vote.php:54 ../user/forum_moderate_post.php:76
+#: ../user/forum_banishment_vote.php:57 ../user/forum_moderate_post.php:79
 msgid "User is already banished"
 msgstr "Cet utilisateur est déjà banni."
 
-#: ../user/forum_banishment_vote.php:59 ../user/forum_moderate_post.php:79
+#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_post.php:82
 msgid ""
 "Are you sure you want to banish %1?<br/>This will prevent %1 from posting "
 "for chosen time period.<br/>It should be done only if %1 has consistently "
 "exhibited trollish behavior."
 msgstr "Etes vous sûr que vous voulez bannir %1?<br/> Ceci empêchera %1 de publier pour une période donnée.<br/> Ceci ne doit être fait que si %1 a explicitement et de façon continue eu une attitude trollesque."
 
-#: ../user/forum_banishment_vote.php:61
+#: ../user/forum_banishment_vote.php:64
 msgid ""
 "Select the reason category, optionally write a longer description of why the"
 " user should be banished."
 msgstr "Choisissez une catégorie et éventuellement une description plus longue sur les raisons pour lesquelles cet utilisateur devrait être banni. "
 
-#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
+#: ../user/forum_banishment_vote.php:65 ../user/forum_moderate_thread.php:56
 msgid "Category"
 msgstr "Catégorie"
 
-#: ../user/forum_banishment_vote.php:64
-#: ../user/forum_banishment_vote_action.php:57
-#: ../user/forum_moderate_post.php:55 ../user/forum_moderate_thread.php:52
+#: ../user/forum_banishment_vote.php:67
+#: ../user/forum_banishment_vote_action.php:59
+#: ../user/forum_moderate_post.php:58 ../user/forum_moderate_thread.php:58
 msgid "Obscene"
 msgstr "Obsénité"
 
-#: ../user/forum_banishment_vote.php:65
-#: ../user/forum_banishment_vote_action.php:59
-#: ../user/forum_moderate_post.php:56 ../user/forum_moderate_thread.php:53
+#: ../user/forum_banishment_vote.php:68
+#: ../user/forum_banishment_vote_action.php:61
+#: ../user/forum_moderate_post.php:59 ../user/forum_moderate_thread.php:59
 msgid "Flame/Hate mail"
 msgstr "Courriel enflammé/haineux"
 
-#: ../user/forum_banishment_vote.php:66
-#: ../user/forum_banishment_vote_action.php:61
-#: ../user/forum_moderate_post.php:59
+#: ../user/forum_banishment_vote.php:69
+#: ../user/forum_banishment_vote_action.php:63
+#: ../user/forum_moderate_post.php:62
 msgid "User Request"
 msgstr "Requête utilisateur"
 
-#: ../user/forum_banishment_vote.php:67
-#: ../user/forum_banishment_vote_action.php:63
-#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:55
-msgid "Other"
-msgstr "Autre"
-
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_post.php:53
-#: ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_post.php:56
+#: ../user/forum_moderate_thread.php:100
 msgid "Reason"
 msgstr "Raison"
 
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_thread.php:100
 msgid "Mailed if nonempty"
 msgstr "Envoyé si non vide"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "Continuez le vote"
 
-#: ../user/forum_banishment_vote_action.php:39
-#: ../user/forum_moderate_post_action.php:63
+#: ../user/forum_banishment_vote_action.php:41
+#: ../user/forum_moderate_post_action.php:66
 msgid "You must specify an action..."
 msgstr "Vous devez choisir une action ..."
 
@@ -3536,7 +3574,7 @@ msgstr "Vous ne pouvez plus éditer ce message.<br/>Les messages peuvent être 
 msgid "You are not authorized to edit this post."
 msgstr "Vous n'êtes pas autorisé à éditer ce message."
 
-#: ../user/forum_edit.php:86 ../user/forum_search.php:72
+#: ../user/forum_edit.php:86 ../user/forum_search.php:74
 msgid "Forum"
 msgstr "Forum"
 
@@ -3545,828 +3583,828 @@ msgid "Edit your message"
 msgstr "Éditer votre message"
 
 #: ../user/forum_edit.php:115 ../user/forum_edit.php:120
-#: ../user/forum_post.php:109 ../user/forum_post.php:111
-#: ../user/team_forum.php:69
+#: ../user/forum_post.php:113 ../user/forum_post.php:115
+#: ../user/team_forum.php:71
 msgid "Title"
 msgstr "Titre"
 
-#: ../user/forum_edit.php:144 ../user/forum_post.php:129
+#: ../user/forum_edit.php:144 ../user/forum_post.php:133
 msgid "Add my signature to this post"
 msgstr "Ajouter ma signature à ce message"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
 msgstr "Non visible pour vous"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "Forum d'équipe pour %1"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "Nouveau sujet"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
 msgstr "Ajouter un nouveau sujet à ce forum"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
 msgstr "Ce forum est également disponible en %sflux RSS%s"
 
-#: ../user/forum_forum.php:174
+#: ../user/forum_forum.php:178
 msgid "This thread is hidden"
 msgstr "Ce sujet est masqué"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "This thread is sticky and locked, and you haven't read it yet"
 msgstr "Ce sujet est épinglé et verrouillé et vous ne l'avez pas encore lu"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
 msgstr "épinglé/verrouillé/non lu"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
 msgstr "Ce sujet est épinglé et vous ne l'avez pas encore lu"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "sticky/unread"
 msgstr "épinglé/non lu"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "You haven't read this thread yet, and it's locked"
 msgstr "Vous n'avez pas encore lu ce sujet, et il est verrouillé"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
 msgstr "non lu/verrouillé "
 
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
 msgstr "Vous n'avez pas encore lu ce sujet"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "This thread is sticky and locked"
 msgstr "Ce sujet est épinglé et verrouillé"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "sticky/locked"
 msgstr "épinglé/verrouillé"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "This thread is sticky"
 msgstr "Ce sujet est épinglé"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "sticky"
 msgstr "épinglé"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "This thread is locked"
 msgstr "Ce sujet est verrouillé"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
 msgstr "verrouillé"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "You read this thread"
 msgstr "Vous lisez ce sujet"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "read"
 msgstr "lu"
 
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "Questions et Réponses"
 
-#: ../user/forum_help_desk.php:30
+#: ../user/forum_help_desk.php:32
 msgid ""
 "Talk live via Skype with a volunteer, in any of several languages. Go to "
 "%1BOINC Online Help%2."
 msgstr "Parlez en direct via Skype avec un volontaire, dans n'importe laquelle des langues suivantes. Allez à %1l'Aide en Ligne BOINC%2."
 
-#: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
+#: ../user/forum_help_desk.php:46 ../user/forum_index.php:97
 msgid "Topic"
 msgstr "Sujet"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "Questions"
 
-#: ../user/forum_index.php:53 ../user/team_forum.php:68
+#: ../user/forum_index.php:58 ../user/team_forum.php:70
 msgid "Discussion among members of %1"
 msgstr "Discussions entres les membres de %1"
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "%1 Forums"
 
-#: ../user/forum_index.php:78
+#: ../user/forum_index.php:83
 msgid ""
 "If you have a question or problem, please use the %1Questions & Answers%2 "
 "section of the message boards."
 msgstr "Si vous avez une question ou un problème, veuillez utiliser la section %1Questions & Réponses%2 des forums."
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
 msgstr "Sujets souscrits"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "Modérer le message"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
 msgstr "Masquer le message"
 
-#: ../user/forum_moderate_post.php:57 ../user/forum_moderate_thread.php:54
+#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:60
 msgid "Commercial spam"
 msgstr "Spam commercial"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
 msgstr "Message dupliqué"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "Déplacer le message"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
 msgstr "ID du sujet de destination:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
 msgstr "Bannir l'utilisateur"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
 msgstr "Durée de l'interdiction"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4 heures"
 
-#: ../user/forum_moderate_post.php:82 ../user/forum_search.php:45
+#: ../user/forum_moderate_post.php:85 ../user/forum_search.php:47
 msgid "1 day"
 msgstr "1 jour"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
 msgstr "1 semaine"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2 semaines"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
 msgstr "1 mois"
 
-#: ../user/forum_moderate_post.php:86
+#: ../user/forum_moderate_post.php:89
 msgid "Forever"
 msgstr "Définitif"
 
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr "Explications optionnelles %1 Ceci est inclus dans le mail à l'utilisateur %2"
-
-#: ../user/forum_moderate_post.php:101 ../user/forum_moderate_thread.php:91
-#: ../user/forum_post.php:130 ../user/forum_report_post.php:85
-#: ../user/forum_rss.php:55 ../user/friend.php:81 ../user/get_passwd.php:41
-#: ../user/get_passwd.php:75
+#: ../user/forum_moderate_post.php:99 ../user/forum_moderate_post.php:112
+#: ../user/forum_moderate_thread.php:106 ../user/forum_post.php:134
+#: ../user/forum_report_post.php:88 ../user/forum_rss.php:51
+#: ../user/friend.php:83 ../user/get_passwd.php:32 ../user/get_passwd.php:75
 msgid "OK"
 msgstr "OK"
 
-#: ../user/forum_moderate_post_action.php:57
+#: ../user/forum_moderate_post.php:107
+msgid "Optional explanation %1 This is included in email to user.%2"
+msgstr "Explications optionnelles %1 Ceci est inclus dans le mail à l'utilisateur %2"
+
+#: ../user/forum_moderate_post_action.php:60
 msgid "You are not authorized to moderate this post."
 msgstr "Vous n'êtes pas autorisé à modérer ce message."
 
-#: ../user/forum_moderate_post_action.php:85
+#: ../user/forum_moderate_post_action.php:105
 msgid "Can't move to different category type"
 msgstr "Impossible de déplacer dans un type de catégorie différente"
 
-#: ../user/forum_moderate_post_action.php:89
+#: ../user/forum_moderate_post_action.php:109
 msgid "Can't move to different category"
 msgstr "Impossible de déplacer dans une catégorie différente"
 
-#: ../user/forum_moderate_post_action.php:110
+#: ../user/forum_moderate_post_action.php:130
 msgid "Not authorized to banish users"
 msgstr "Non autorisé à bannir des utilisateurs"
 
-#: ../user/forum_moderate_post_action.php:126
+#: ../user/forum_moderate_post_action.php:146
 msgid "Banishment"
 msgstr "Bannissement"
 
-#: ../user/forum_moderate_post_action.php:128
+#: ../user/forum_moderate_post_action.php:148
 msgid "User %1 has been banished."
 msgstr "L'utilisateur %1 a été banni"
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
 msgstr "Echec de l'action : problème de base de données probable"
 
-#: ../user/forum_moderate_thread.php:33
+#: ../user/forum_moderate_thread.php:38
 msgid "not authorized"
 msgstr "non autorisé"
 
-#: ../user/forum_moderate_thread.php:36
+#: ../user/forum_moderate_thread.php:41
 msgid "Moderate thread '%1'"
 msgstr "Modérer le sujet '%1'"
 
-#: ../user/forum_moderate_thread.php:48
+#: ../user/forum_moderate_thread.php:54
 msgid ""
 "Select the reason category, or write a longer description of why you're "
 "hiding or locking the thread; then press OK."
 msgstr "Choisir la catégorie de motif, ou écrivez une description plus longue sur les raisons pour lesquelles vous masquez ou verrouillez ce sujet puis validez."
 
-#: ../user/forum_moderate_thread.php:72
+#: ../user/forum_moderate_thread.php:78
 msgid "Current forum"
 msgstr "Forum actuel"
 
-#: ../user/forum_moderate_thread.php:73
+#: ../user/forum_moderate_thread.php:79
 msgid "Destination forum"
 msgstr "Forum de destination"
 
-#: ../user/forum_moderate_thread.php:77
+#: ../user/forum_moderate_thread.php:83
 msgid "New title:"
 msgstr "Nouveau titre:"
 
-#: ../user/forum_post.php:40
+#: ../user/forum_post.php:44
 msgid ""
 "Only project admins may create a thread here. However, you may reply to "
 "existing threads."
 msgstr "Seuls les administrateurs de projets peuvent créer un sujet ici. Cependant vous pouvez répondre dans des sujets existants."
 
-#: ../user/forum_post.php:60
+#: ../user/forum_post.php:64
 msgid ""
 "Your message was flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "Votre réponse a été marquée comme spam par le système anti-spam Akismet. Veuillez modifier votre texte et réessayer."
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
 msgstr "Créer une nouvelle discussion"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
 msgstr "Créer une nouvelle discussion"
 
-#: ../user/forum_post.php:105
+#: ../user/forum_post.php:109
 msgid "Remember to add a title"
 msgstr "Pensez à ajouter un titre"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Show this item as a Notice in the BOINC Manager"
 msgstr "Montrer cette information comme une notification dans le BOINC Manager"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Do so only for items likely to be of interest to all volunteers."
 msgstr "Ne le faire que pour des informations pouvant être intéressantes pour tous les volontaires."
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
 msgstr "Noter hors ligne"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
 msgstr "Cette fonctionnalité est désactivée temporairement"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
 msgstr "Vous devez avoir un crédit moyen ou total supérieur pour pouvoir noter un message."
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
 msgstr "Vous avez déjà noté ce message."
 
-#: ../user/forum_rate.php:62 ../user/forum_rate.php:78
-#: ../user/forum_rate.php:83 ../user/forum_report_post.php:69
-#: ../user/forum_report_post.php:94 ../user/forum_subscribe.php:54
-#: ../user/forum_subscribe.php:69 ../user/forum_thread_status.php:51
+#: ../user/forum_rate.php:64 ../user/forum_rate.php:80
+#: ../user/forum_rate.php:85 ../user/forum_report_post.php:72
+#: ../user/forum_report_post.php:97 ../user/forum_subscribe.php:56
+#: ../user/forum_subscribe.php:71 ../user/forum_thread_status.php:56
 msgid "Return to thread"
 msgstr "Retour au sujet"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
 msgstr "Saisie enregistrée"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
 msgstr "Votre saisie a été enregistrée. Merci de votre aide."
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
 msgstr "Vote enregistré"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
 msgstr "Votre note a été enregistrée. Merci de votre participation."
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
 msgstr "Problème d'envoi de vote"
 
-#: ../user/forum_reply.php:73
+#: ../user/forum_reply.php:76
 msgid ""
 "Your post has been flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "Votre message a été marqué comme spam par le système anti-spam Akismet. Veuillez modifier votre texte et réessayer."
 
-#: ../user/forum_reply.php:88 ../user/forum_thread.php:158
-#: ../user/forum_thread.php:274
+#: ../user/forum_reply.php:91 ../user/forum_thread.php:159
+#: ../user/forum_thread.php:284
 msgid "Post to thread"
 msgstr "Écrire un message dans la discussion"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "Message:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
 msgstr "répondre au %1Message ID%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
 msgstr "Envoyer la réponse"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
 msgstr "Ajouter ma signature à ce message"
 
-#: ../user/forum_report_post.php:45
+#: ../user/forum_report_post.php:48
 msgid "You need more average or total credit to report a post."
 msgstr "Vous devez avoir un crédit moyen ou total supérieur pour pouvoir signaler ce message."
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "Signalement enregistré"
 
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "Votre signalement a été enregistré. Merci de votre participation."
 
-#: ../user/forum_report_post.php:67
+#: ../user/forum_report_post.php:70
 msgid ""
 "A moderator will now look at your report and decide what will happen - this "
 "may take a little while, so please be patient"
 msgstr "Un modérateur va maintenant regarder votre signalement et décider de ce qui doit se passer - cela peut prendre du temps, merci d'être patient."
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "Signaler un message du forum"
 
-#: ../user/forum_report_post.php:73
+#: ../user/forum_report_post.php:76
 msgid ""
 "Before reporting this post, consider using the +/- rating system instead. If"
 " enough users rate a post negatively it will eventually be hidden.<br />You "
 "can find the rating system at the bottom of the post."
 msgstr "Avant de signaler de message, songez plutôt à utiliser le système de note +/-. Si suffisamment d'utilisateurs note négativement un message il finira par être masqué.<br/>Vous trouverez le système de notation en bas de ce message."
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "Signaler un message"
 
-#: ../user/forum_report_post.php:81
+#: ../user/forum_report_post.php:84
 msgid ""
 "Why do you find the post offensive: %1Please include enough information so that a person that\n"
 "has not yet read the thread will quickly be able to identify the issue.%2"
 msgstr "Pourquoi trouvez vous ce message insultant : %1Merci d'inclure suffisamment d'information pour qu'une personne \nn'ayant pas encore lu le sujet puisse être capable d'identifier rapidement le problème%2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
 msgstr "Signalement non enregistré"
 
-#: ../user/forum_report_post.php:91
+#: ../user/forum_report_post.php:94
 msgid "Your report could not be recorded. Please wait a while and try again."
 msgstr "Votre signalement n'a pas pu être enregistré. Merci d'attendre avant d'essayer de nouveau."
 
-#: ../user/forum_report_post.php:92
+#: ../user/forum_report_post.php:95
 msgid ""
 "If this is not a temporary error, please report it to the project "
 "developers."
 msgstr "Si cela n'est pas une erreur temporaire, merci de le signaler à l'administrateur du projet."
 
-#: ../user/forum_rss.php:41
+#: ../user/forum_rss.php:38
 msgid "%1 RSS feed"
 msgstr "%1 flux RSS"
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
 msgstr "Ce forum est également disponible en flux RSS."
 
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
 msgstr "Options:"
 
-#: ../user/forum_rss.php:47
+#: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
 msgstr "N'inclure que les messages pour l'utilisateur ID %1 (valeur par défaut : tous les utilisateurs)"
 
-#: ../user/forum_rss.php:49
+#: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
 msgstr "N'inclure que les messages des %1 derniers jours (valeur par défaut : 30)"
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr "Tronquer les messages : %1 (n'inclure que les 256 premiers caractères de chaque message)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
 msgstr "Sujets seulement: %1 (n'inclure que les premiers messages de chaque sujet)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
 msgstr "Recherche sur le forum"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "Requête de recherche"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "Chercher les mots clés:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
 msgstr "Les messages contenant tous les mots spécifiés seront affichés"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
 msgstr "Par exemple : \"Économiseur d'écran figé\""
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "Rechercher par identifiant de l'auteur :"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
 msgstr "Seuls les messages de cet auteur seront affichés"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
 msgstr "Par exemple: \"43214\""
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "Options de recherche"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "Limites de recherche"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
 msgstr "Rechercher au plus ce nombre de jours dans le passé"
 
-#: ../user/forum_search.php:50 ../user/forum_search.php:51
+#: ../user/forum_search.php:52 ../user/forum_search.php:53
 msgid "%1 months"
 msgstr "%1 mois"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
 msgstr "1 an"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "aucune limite"
+
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
 msgstr "Afficher uniquement les messages de ce forum"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
 msgstr "Trier par"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
 msgstr "Démarrer la recherche"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
 msgstr "Résultats de la recherche sur le forum"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
 msgstr "Titres de sujet correspondant à votre requête :"
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
 msgstr "Messages correspondant à votre requête :"
 
-#: ../user/forum_search_action.php:217
+#: ../user/forum_search_action.php:219
 msgid ""
 "Sorry, couldn't find anything matching your search query. You can try to "
 "broaden your search by using less words (or less specific words)."
 msgstr "Désolé, impossible de trouver une correspondance à votre requête. Vous pouvez essayer d'élargir votre recherche en utilisant moins de mots (ou des mots moins spécifiques)."
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
 msgstr "Vous pouvez aussi %1 tenter la même recherche sur Google. %2"
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
 msgstr "Exécutez une autre recherche"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
 msgstr "Abonnement réussi"
 
-#: ../user/forum_subscribe.php:49
+#: ../user/forum_subscribe.php:51
 msgid ""
 "You are now subscribed to %1. You will be notified whenever there is a new "
 "post."
 msgstr "Vous êtes maintenant abonné à %1. Vous serez notifiés à chaque nouveau message."
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
 msgstr "Abonnement échoué"
 
-#: ../user/forum_subscribe.php:52
+#: ../user/forum_subscribe.php:54
 msgid ""
 "We are currently unable to subscribe you to %1. Please try again later.."
 msgstr "Nous ne pouvons pas actuellement vous abonner à %1. Veuillez réessayer plus tard.."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
 msgstr "Désabonnement réussi"
 
-#: ../user/forum_subscribe.php:64
+#: ../user/forum_subscribe.php:66
 msgid ""
 "You are no longer subscribed to %1. You will no longer receive notifications"
 " for this thread."
 msgstr "Vous n'êtes plus abonné à %1. Vous ne recevrez plus de notifications pour ce sujet."
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
 msgstr "Désabonnement échoué"
 
-#: ../user/forum_subscribe.php:67
+#: ../user/forum_subscribe.php:69
 msgid ""
 "We are currently unable to unsubscribe you from %1. Please try again later.."
 msgstr "Nous ne pouvons pas vous désabonner maintenant de %1. Veuillez réessayer plus tard."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
 msgstr "Action d'abonnement inconnue"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
 msgstr "Ce forum vous est invisible."
 
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
 msgstr "Ce sujet a été masqué par les modérateurs."
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
 msgstr "On a répondu à ma question"
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
 msgstr "Cliquer ici si vous avez obtenu une réponse correcte"
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
 msgstr "J'ai également cette question"
 
-#: ../user/forum_thread.php:159 ../user/forum_thread.php:275
+#: ../user/forum_thread.php:160 ../user/forum_thread.php:285
 msgid "Add a new message to this thread"
 msgstr "Ajouter un message à ce sujet"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "Désinscription"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
 msgstr "Vous avez souscrit à ce sujet.  Cliquez ici pour vous désinscrire."
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
 msgstr "Souscription"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
 msgstr "Cliquez ici pour être averti par email lorsque de nouveaux messages sont ajoutés à ce sujet"
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
 msgstr "Démasquer ce sujet"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
 msgstr "Masquer ce sujet"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
 msgstr "Ne plus épingler"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
 msgstr "Ne pas mettre ce sujet en évidence"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
 msgstr "Epingler"
 
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr "Epingler ce sujet"
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "Faire apparaître cette discussion toujours en haut du forum"
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
 msgstr "Déverrouiller"
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr "Déverrouiller ce sujet"
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "Autorisez de nouveaux messages dans cette discussion"
 
-#: ../user/forum_thread.php:221
+#: ../user/forum_thread.php:222
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
-msgstr "Verrouiller ce sujet"
+#: ../user/forum_thread.php:223
+msgid "Don't allow new posts in this thread"
+msgstr "N'autorisez pas de nouveaux messages dans cette discussion"
 
-#: ../user/forum_thread.php:229
+#: ../user/forum_thread.php:230
 msgid "Move this thread to a different forum"
 msgstr "Déplacer ce sujet vers un forum différent"
 
-#: ../user/forum_thread.php:234
+#: ../user/forum_thread.php:235
 msgid "Edit title"
 msgstr "Éditer le titre"
 
-#: ../user/forum_thread.php:235
+#: ../user/forum_thread.php:236
 msgid "Edit thread title"
 msgstr "Éditer le titre du sujet"
 
-#: ../user/forum_thread.php:245
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "Supprimer la discussion définitivement"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
 msgstr "Exporter en tant que Notification"
 
-#: ../user/forum_thread.php:251
+#: ../user/forum_thread.php:260
 msgid "Don't export"
 msgstr "Ne pas exporter"
 
-#: ../user/forum_thread.php:252
+#: ../user/forum_thread.php:261
 msgid "Don't export this news item as a Notice"
 msgstr "Ne pas exporter cette actualité en tant que Notification"
 
-#: ../user/forum_thread.php:260 ../user/forum_thread.php:262
+#: ../user/forum_thread.php:270 ../user/forum_thread.php:272
 msgid "Sort"
 msgstr "Trier"
 
-#: ../user/forum_thread_status.php:49
+#: ../user/forum_thread_status.php:54
 msgid "Thread status updated"
 msgstr "Statut du sujet mis à jour"
 
-#: ../user/forum_thread_status.php:50
+#: ../user/forum_thread_status.php:55
 msgid "The status has been updated."
 msgstr "Le statut a été mis à jour."
 
-#: ../user/forum_user_posts.php:73
+#: ../user/forum_user_posts.php:75
 msgid "Posts by %1"
 msgstr "Publié par %1"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
 msgstr "Déjà amis"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
 msgstr "Vous avez souhaité être ami avec %1 sur %2."
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
 msgstr "Cette requête est toujours en attente de confirmation."
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
 msgstr "%1 n'accepte pas de demande d'amitié de votre part"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
 msgstr "Vous ne pouvez pas être ami avec vous-même"
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
 msgstr "Ajouter ami"
 
-#: ../user/friend.php:74
+#: ../user/friend.php:76
 msgid ""
 "You have asked to add %1 as a friend. We will notify %1 and will ask him/her"
 " to confirm that you are friends."
 msgstr "Vous avez demandé à être ami avec %1. Nous avons notifié %2 pour qu'il/elle confirme que vous êtes bien amis."
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
 msgstr "Ajoutez un message optionnel ici : "
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
 msgstr "Requête d'amitié envoyée"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
 msgstr "Nous avons notifié %1 de votre requête."
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr "Veuillez vous connecter en tant que %1"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr "Vous devez vous connecter en tant que %1 pour voir la demande d'amitié"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
 msgstr "Requête d'amitié"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
 msgstr "%1 vous a envoyé une demande d'amitié."
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr "%1 dit : %2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
 msgstr "Accepter l'amitié"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
 msgstr "Cliquez sur accepter si %1 est un(e) ami(e)"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
 msgstr "Décliner"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
 msgstr "Cliquez sur décliner si %1 n'est pas un(e) ami(e)"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
 msgstr "Amitié confirmée"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
 msgstr "Votre amitié avec %1 a été confirmée."
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
 msgstr "Amitié déclinée"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
 msgstr "Votre amitié avec %1 a été déclinée."
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
 msgstr "Notification introuvable"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
 msgstr "Ami(e) confirmé(e)"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
 msgstr "Vous êtes maintenant ami(e) avec %1."
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
 msgstr "Annuler l'amitié ?"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
 msgstr "Êtes-vous sûr de vouloir annuler votre amitié avec %1 ?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
 msgstr "Rester amis"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
 msgstr "Amitié annulée"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
 msgstr "Votre amitié avec %1 a été annulée."
 
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr "Vous avez oublié les informations de votre compte ?"
-
-#: ../user/get_passwd.php:28
+#: ../user/get_passwd.php:27
 msgid ""
 "1) If you know your account's email address, and you can receive email "
 "there:"
 msgstr "1) Si vous connaissez l'adresse email de votre compte, vous pouvez recevoir un email ici :"
 
-#: ../user/get_passwd.php:29
+#: ../user/get_passwd.php:28
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
@@ -4417,14 +4455,23 @@ msgstr "Vous serez alors connecté à votre compte, mettez à jour votre email e
 msgid "Log in with authenticator"
 msgstr "Connectez vous avec l'authentificateur"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "Vous avez oublié les informations de votre compte ?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
 msgstr "Pas de tâche GPU rapportée "
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Meilleurs modèles GPU"
+
+#: ../user/gpu_list.php:207
 msgid ""
 "The following lists show the most productive GPU models on different "
-"platforms.  Relative speeds are shown in parentheses."
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
 msgstr "Les listes suivantes présentent les modèles de GPU les plus productifs sur les différentes plates-formes. Les vitesses relatives sont indiquées entre parenthèses."
 
 #: ../user/home.php:42
@@ -4439,6 +4486,10 @@ msgstr "Voir et éditer vos préférences de compte en utilisant les liens ci-de
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "Si vous ne l'avez pas déjà fait, %1téléchargez le logiciel client BOINC %2."
 
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "Votre compte"
+
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
 msgstr "Plateforme anonyme, application manquante"
@@ -4553,10 +4604,14 @@ msgstr "Aucun hôte"
 msgid "Merge hosts"
 msgstr "Fusionner les hôtes"
 
-#: ../user/host_update_credit.php:28
+#: ../user/host_update_credit.php:27
 msgid "Updating computer credit"
 msgstr "Mettre à jour les crédit de l'ordinateur"
 
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "Crédits de l'hôte mis à jour"
+
 #: ../user/host_venue_action.php:41
 msgid "Host venue updated"
 msgstr "Emplacement de l'hôte mis à jour"
@@ -4638,6 +4693,10 @@ msgstr "image ; la hauteur ne peut excéder 450 pixels. Merci de ne pas faire de
 msgid "You can also use ampersand notation for special characters."
 msgstr "Vous pouvez également utiliser la notation esperluète pour les caractères spéciaux."
 
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "Lisez nos règles et lignes de conduite"
+
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
 msgstr "N'utilisez %1 que sur des machines pour lesquelles vous en avez l'autorisation"
@@ -4811,27 +4870,7 @@ msgid ""
 "%1you can provide a translation%2."
 msgstr "Les traductions sont effectuées par des volontaires.  Si votre langue native n'y est pas, %1vous pouvez fournir une traduction%2."
 
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "Adresse email :"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "adresse email oubliée ?"
-
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr "mot de passe oublié ?"
-
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr "Rester connecté"
-
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "ou %1créer un compte%2"
 
@@ -4955,244 +4994,248 @@ msgstr "Vous n'avez pas de message privé."
 msgid "Sender and date"
 msgstr "Émetteur et date"
 
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "Répondre à ce message"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "Supprimer ce message"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
 msgstr "Sélectionner tout "
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
 msgstr "Dé-sélectionner tout"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
 msgstr "Supprimer le message sélectionné"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
 msgstr "Émetteur"
 
-#: ../user/pm.php:143
+#: ../user/pm.php:148
 msgid "Date"
 msgstr "Date"
 
-#: ../user/pm.php:185
+#: ../user/pm.php:190
 msgid "You need to fill all fields to send a private message"
 msgstr "Vous devez remplir tous les champs pour envoyer un message privé"
 
-#: ../user/pm.php:188
+#: ../user/pm.php:193
 msgid ""
 "Your message was flagged as spam\n"
 "                by the Akismet anti-spam system.\n"
 "                Please modify your text and try again."
 msgstr "Votre réponse a été marquée comme spam \n                                                     par le système anti-spam Akismet.\n                                                     Veuillez modifier votre texte et réessayer."
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr "Impossible de trouver l'utilisateur avec l'identifiant %1"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr "Impossible de trouver l'utilisateur avec le nom d'utilisateur %1"
 
-#: ../user/pm.php:212
+#: ../user/pm.php:217
 msgid "%1 is not a unique username; you will have to use user ID"
 msgstr "%1 est un nom d'utilisateur déjà attribué; merci de choisir un autre identifiant."
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
 msgstr "L'utilisateur %1 (ID : %2) n'accepte pas vos messages privés."
 
-#: ../user/pm.php:240 ../user/view_profile.php:26
+#: ../user/pm.php:245 ../user/view_profile.php:28
 msgid "No such user"
 msgstr "Utilisateur inexistant"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
 msgstr "Voulez-vous réellement bloquer %1 ?"
 
-#: ../user/pm.php:243
+#: ../user/pm.php:248
 msgid ""
 "Are you really sure you want to block user %1 from sending you private "
 "messages?"
 msgstr "Etes-vous réellement certain de vouloir bloquer l'a réception des messages privés provenant de l'utilisateur %1 ?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
 msgstr "Veuillez noter que vous ne pouvez bloquer qu'un nombre limité d'utilisateurs."
 
-#: ../user/pm.php:245
+#: ../user/pm.php:250
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
 msgstr "Un fois l'utilisateur bloqué, vous pouvez le débloquer en utilisant la page \"préférences du forum\"."
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
 msgstr "Non, annuler"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
 msgstr "Utilisateur inexistant"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
 msgstr "Utilisateur %1 bloqué"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
 msgstr "L'utilisateur %1 a été bloqué et ne peut plus vous envoyer de messages privés."
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
 msgstr "Pour débloquer, aller sur les %1préférences de messages%2"
 
-#: ../user/pm.php:302
+#: ../user/pm.php:307
 msgid "Unknown action"
 msgstr "Action inconnue"
 
-#: ../user/prefs.php:32
+#: ../user/prefs.php:33
 msgid ""
 "Your preferences have been updated, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "Vos préférences ont été mises à jour. Les préférences du client\nseront prises en compte lorsque votre ordinateur communiquera avec %1\nou si vous utilisez la commande %2Mise à jour%3 depuis le BOINC Manager."
 
-#: ../user/prefs.php:41
+#: ../user/prefs.php:42
 msgid ""
 "Your preferences have been reset to the defaults, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "Vos préférences ont été réinitialisées et\n                                  prendront effet lorsque votre ordinateur communiquera avec %1\n                                  ou si vous demandez une %2mises à jour%3 depuis le BOINC Manager."
 
-#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+#: ../user/prefs_edit.php:66 ../user/prefs_edit.php:94
 msgid "%1 for %2"
 msgstr "%1 pour %2"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
 msgstr "Retour aux préférences"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
 msgstr "Confirmer la suppression des préférences"
 
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:49
 msgid "Are you sure you want to delete your separate %1 preferences for %2?"
 msgstr "Voulez-vous vraiment supprimer vos préférences séparées de %1 pour %2 ?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
 msgstr "Supprimer les préférences"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "Profils"
+
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
 msgstr "%1Profils%2 permet à chacun de partager des choses et opinions avec la communauté."
 
-#: ../user/profile_menu.php:36
+#: ../user/profile_menu.php:38
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
 msgstr "Explorez la diversité de vos camarades également volontaires, et apportez la contribution de vos propres vues à d'autres que vous appréciez."
 
-#: ../user/profile_menu.php:37
+#: ../user/profile_menu.php:39
 msgid ""
 "If you haven't already, you can %1create your own user profile%2 for others "
 "to see!"
 msgstr "Si ce n'est déjà fait, vous pouvez créer votre %1profil utilisateur%2 qui sera visible par les autres utilisateurs !"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
 msgstr "L'utilisateur du jour"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
 msgstr "Navigateur de profil utilisateur"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
 msgstr "Regarder la %1galerie photo%2 de l'utilisateur."
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr "Parcourir les profils %1par pays%2."
 
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:64
 msgid ""
 "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
 "without pictures%2."
 msgstr "Parcourir les profils %1aléatoirement%2, %3aléatoirement avec photos%2, ou %4aléatoirement sans photos%2."
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
 msgstr "Liste des profils par ordre alphabétique :"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
 msgstr "Rechercher un profil par texte"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
 msgstr "Aucun profil"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
 msgstr "Aucun profil ne correspond à votre requête."
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
 msgstr "Type de vote invalide :"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
 msgstr "Vote enregistré"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
 msgstr "Merci"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
 msgstr "Votre recommandation a été enregistrée"
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
 msgstr "Votre vote de rejet de ce profil a été enregistré."
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
 msgstr "Retour au profil."
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
 msgstr "Profils contenant '%1'"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
 msgstr "Nom de l'utilisateur"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
 msgstr "Projet rejoint"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "Crédits récents"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
 msgstr "Aucun profil contenant '%1'"
 
@@ -5220,149 +5263,61 @@ msgstr "Il manque l'ID de l'utilisateur ou du hôte"
 msgid "No tasks to display"
 msgstr "Aucune tâche à afficher"
 
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr "En cours d'exécution"
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "Utilisateur du jour"
 
-#: ../user/server_status.php:100
+#: ../user/server_status.php:59
 msgid "Not Running"
 msgstr "Arrêté"
 
-#: ../user/server_status.php:103
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "En cours d'exécution"
+
+#: ../user/server_status.php:67
 msgid "Disabled"
 msgstr "Suspendu"
 
-#: ../user/server_status.php:231
+#: ../user/server_status.php:105
 msgid "Project status"
 msgstr "Statut du projet"
 
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr "Version du serveur: %1"
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "État du serveur"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Program"
 msgstr "Programme"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Host"
 msgstr "Hôte"
 
-#: ../user/server_status.php:252
-msgid "data-driven web pages"
-msgstr "pages web pilotée par les données"
-
-#: ../user/server_status.php:258
-msgid "upload/download server"
-msgstr "serveur d'upload/download"
-
-#: ../user/server_status.php:261
-msgid "scheduler"
-msgstr "ordonnanceur"
-
-#: ../user/server_status.php:294
-msgid "Running:"
-msgstr "En cours d'exécution:"
-
-#: ../user/server_status.php:295
-msgid "Program is operating normally"
-msgstr "Le programme fonctionne normalement"
-
-#: ../user/server_status.php:296
-msgid "Not Running:"
-msgstr "Arrêté:"
-
-#: ../user/server_status.php:297
-msgid "Program failed or the project is down"
-msgstr "Programme en échec ou projet arrêté"
-
-#: ../user/server_status.php:298
-msgid "Disabled:"
-msgstr "Suspendu:"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Version du schéma de base de donnée:"
 
-#: ../user/server_status.php:299
-msgid "Program is disabled"
-msgstr "Le programme est suspendu"
-
-#: ../user/server_status.php:303
+#: ../user/server_status.php:134
 msgid "Computing status"
 msgstr "État de l'exécution"
 
-#: ../user/server_status.php:309
-msgid "The database server is not accessible"
-msgstr "Le serveur de base de donnée n'est pas joignable"
-
-#: ../user/server_status.php:326
-msgid "Tasks ready to send"
-msgstr "Tâches prêtes à l'envoi"
-
-#: ../user/server_status.php:331 ../user/workunit.php:55
-msgid "Tasks in progress"
-msgstr "Tâches en cours"
-
-#: ../user/server_status.php:336
-msgid "Workunits waiting for validation"
-msgstr "Unités de travail en attente de validation"
-
-#: ../user/server_status.php:341
-msgid "Workunits waiting for assimilation"
-msgstr "Unités de travail en attente d'assimilation"
-
-#: ../user/server_status.php:346
-msgid "Workunits waiting for file deletion"
-msgstr "Unités de travail en attente de nettoyage de fichiers"
-
-#: ../user/server_status.php:351
-msgid "Tasks waiting for file deletion"
-msgstr "Tâches en attente de nettoyage de fichiers"
-
-#: ../user/server_status.php:367
-msgid "Transitioner backlog (hours)"
-msgstr "Transitioner backlog (heures)"
-
-#: ../user/server_status.php:374
+#: ../user/server_status.php:149
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../user/server_status.php:377 ../user/server_status.php:395
-msgid "with recent credit"
-msgstr "avec des crédits récents"
-
-#: ../user/server_status.php:382 ../user/server_status.php:400
-msgid "with credit"
-msgstr "avec des crédits"
-
-#: ../user/server_status.php:387 ../user/server_status.php:405
-msgid "registered in past 24 hours"
-msgstr "enregistrés dans les dernières 24 heures"
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr "GigaFLOPs actuels"
-
-#: ../user/server_status.php:420
+#: ../user/server_status.php:161
 msgid "Tasks by application"
 msgstr "Tâches par application"
 
-#: ../user/server_status.php:423 ../user/workunit.php:40
-msgid "application"
-msgstr "applications"
-
-#: ../user/server_status.php:424
-msgid "unsent"
-msgstr "non envoyé"
-
-#: ../user/server_status.php:425
-msgid "in progress"
-msgstr "en cours"
-
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
-msgstr "temps d'exécution moyen des 100 derniers résultats en heures (min-max)"
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "Temps d'exécution moyen des 100 derniers résultats en heures (min-max)"
 
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr "utilisateurs dans les dernières 24 heures"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "Utilisateurs dans les dernières 24 heures"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5372,679 +5327,701 @@ msgstr "Ordinateur %1"
 msgid "Statistics and leaderboards"
 msgstr "Statistiques et tableaux principaux"
 
-#: ../user/stats.php:28
+#: ../user/stats.php:30
 msgid "Statistics for %1"
 msgstr "Statistiques de %1"
 
-#: ../user/stats.php:37
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "Top des participants"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "Top des équipes"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "Top des ordinateurs"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "Modèles GPU"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "Modèles CPU"
+
+#: ../user/stats.php:53
 msgid ""
 "More detailed statistics for %1 and other BOINC-based projects are available"
 " at several web sites:"
 msgstr "Des statistiques plus détaillées pour %1 et d'autres projets basés sur BOINC sont disponibles sur ces différents sites web :"
 
-#: ../user/stats.php:40
+#: ../user/stats.php:56
 msgid ""
 "You can also get your current statistics in the form of a \"signature "
 "image\":"
 msgstr "Vous pouvez également avoir vos statistiques courantes sous la forme d'une \"image de signature\" :"
 
-#: ../user/stats.php:43
+#: ../user/stats.php:59
 msgid ""
 "Additionally you can get your individual statistics summed across all BOINC "
 "projects from several sites; see your %1home page%2."
 msgstr "Accessoirement, vous pouvez avoir la somme de vos statistiques individuelles sur tous les projets BOINC de sites différents; allez voir votre %1page d'accueil%2."
 
 #: ../user/team.php:27
+msgid "Teams"
+msgstr "Equipes"
+
+#: ../user/team.php:29
 msgid "%1 participants may form %2teams%3."
 msgstr "%1 participants peuvent former une %2équipes%"
 
-#: ../user/team.php:29
+#: ../user/team.php:31
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
 msgstr "Vous ne pouvez appartenir qu'à une seule équipe. Vous pouvez quitter ou joindre une équipe à tout moment."
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
 msgstr "Chaque équipe a un %fondateur%2 qui peut :"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
 msgstr "accéder aux adresses email des membres de l'équipe"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
 msgstr "éditer le nom et la description de l'équipe"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
 msgstr "Ajouter ou supprimer des administrateurs de l'équipe"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
 msgstr "supprimer des membres de l'équipe"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
 msgstr "supprimer l'équipe si elle n'a aucun membre"
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
 msgstr "Pour rejoindre une équipe, visitez la page de cette équipe et cliquez sur %Rejoindre cette équipe%2."
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
 msgstr "Trouver une équipe"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
 msgstr "Toutes les équipes"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
 msgstr "%1 équipes"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
 msgstr "Créer une nouvelle équipe"
 
-#: ../user/team.php:59
+#: ../user/team.php:61
 msgid ""
 "If you cannot find a team that is right for you, you can %1create a team%2."
 msgstr "Si vous ne trouvez pas d'équipe vous correspondant, vous pouvez %1créer une équipe%2."
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
 msgstr "Supprimer ce membre des administrateurs de l'équipe"
 
-#: ../user/team_admins.php:40 ../user/team_admins.php:51
+#: ../user/team_admins.php:42 ../user/team_admins.php:53
 msgid "Add or remove Team Admins"
 msgstr "Ajouter ou supprimer des administrateurs de l'équipe"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
 msgstr "Vous pouvez sélectionner des membres de l'équipe comme 'administrateurs de l'équipe'.\nCes administrateurs peuvent :"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "Éditer les informations de l'équipe (nom, URL, description, pays)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
 msgstr "Voir l'historique des entrées/départs de l'équipe"
 
-#: ../user/team_admins.php:45
+#: ../user/team_admins.php:47
 msgid ""
 "Moderate the team forum, if any (admins get email notification of moderation"
 " events and red X reports)"
 msgstr "Modérer le forum de l'équipe, s'il existe (les administrateurs reçoivent des notification par e-mail des événements de modération et des rapports 'rouges X')"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
 msgstr "Les administrateurs de l'équipe ne peuvent pas :"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
 msgstr "Modifier le nom du fondateur de l'équipe"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
 msgstr "Supprimer des membres"
 
-#: ../user/team_admins.php:53
+#: ../user/team_admins.php:55
 msgid "If a Team Admin quits the team, they cease to be a Team Admin."
 msgstr "Si une administrateur quitte l'équipe, il cesse d'être administrateur d'équipe."
 
-#: ../user/team_admins.php:54
+#: ../user/team_admins.php:56
 msgid ""
 "We recommend that you select only people you know and trust very well as "
 "Team Admins."
 msgstr "Nous vous recommandons de sélectionner uniquement des gens que vous connaissez et auxquels vous avez pleinement confiance pour être administrateur de l'équipe."
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
 msgstr "Il n'y a actuellement aucun administrateur de l'équipe"
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
 msgstr "Administrateurs de l'équipe actuels"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
 msgstr "Administrateur de l'équipe depuis"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
 msgstr "Ajouter un administrateur de l'équipe"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
 msgstr "Adresse e-mail du membre de l'équipe :"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
 msgstr "échec de la suppression de l'administrateur"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
 msgstr "L'utilisateur n'est pas membre de l'équipe"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
 msgstr "%1 est déjà administrateur de %2"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
 msgstr "Impossible d'ajouter l'administrateur"
 
-#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
+#: ../user/team_admins.php:113 ../user/team_manage.php:85
+#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:30
 msgid "No such team"
 msgstr "Équipe inexistante"
 
-#: ../user/team_change_founder_action.php:30
-#: ../user/team_change_founder_form.php:33 ../user/team_display.php:67
-#: ../user/team_edit_action.php:30 ../user/team_edit_form.php:29
-#: ../user/team_email_list.php:55
+#: ../user/team_change_founder_action.php:32
+#: ../user/team_change_founder_form.php:35 ../user/team_display.php:69
+#: ../user/team_edit_action.php:32 ../user/team_edit_form.php:31
+#: ../user/team_email_list.php:64
 msgid "no such team"
 msgstr "équipe inexistante"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
 msgstr "L'utilisateur n'est pas membre de %1"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr "En cours de modification du fondateur de %1"
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
 msgstr "%1 est maintenant le fondateur de %2"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr "Modifier le fondateur de %1"
 
-#: ../user/team_change_founder_form.php:43
+#: ../user/team_change_founder_form.php:45
 msgid ""
 "Team member %1 requested this team's foundership on %2, but left the team, "
 "thus canceling the request."
 msgstr "Le membre %1 a demandé à être déclaré fondateur de l'équipe le %2, mais a quitté l'équipe depuis : la requête va être supprimée."
 
-#: ../user/team_change_founder_form.php:49
+#: ../user/team_change_founder_form.php:51
 msgid ""
 "Team member %1 has requested this team's foundership. This may be because "
 "you left the team or haven't had contact with the team for a long time."
 msgstr "Le membre %1 a demandé à être déclaré fondateur de l'équipe. Ceci peut être du au fait que vous avez quitté l'équipe ou que vous n'avez eu aucun contact avec l'équipe depuis un long moment."
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
 msgstr "décline la requête"
 
-#: ../user/team_change_founder_form.php:58
+#: ../user/team_change_founder_form.php:60
 msgid ""
 "If you don't decline the request by %1, %2 will have the option of assuming team foundership.<br /><br />\n"
 "                  To accept the request, assign foundership to %3 using the form below."
 msgstr "Si vous ne déclinez pas la requête par %1, %2 aura l'option d'assumer le rôle de fondateur de l'équipe.<br /><br />\n                                Pour accepter la requête, assignez le rôle de fondateur à %3 en utilisant le formulaire ci-dessous."
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
 msgstr "Aucune requête de transfert en attente."
 
-#: ../user/team_change_founder_form.php:69
+#: ../user/team_change_founder_form.php:71
 msgid ""
 "To assign foundership of this team to another member, check the box next to "
 "member name and click <strong>Change founder</strong> below."
 msgstr "Pour assigner le rôle de fondateur de cette équipe à un autre membre, sélectionnez le membre via la boîte de sélection située près de son nom et cliquer <strong>Changer de fondateur</strong> ci-dessous."
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
 msgstr "Nouveau fondateur ?"
 
-#: ../user/team_change_founder_form.php:105 ../user/team_manage.php:56
+#: ../user/team_change_founder_form.php:107 ../user/team_manage.php:58
 msgid "Change founder"
 msgstr "Changer de fondateur"
 
-#: ../user/team_change_founder_form.php:108
+#: ../user/team_change_founder_form.php:110
 msgid "There are no users to transfer team to."
 msgstr "Il n'y a pas d'utilisateur à qui transférer l'équipe."
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
 msgstr "Vous devez choisir une nom d'équipe"
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
 msgstr "Une équipe nommée %1 existe déjà. Essayez un autre nom"
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
 msgstr "Impossible de créer l'équipe. Essayez plus tard."
 
-#: ../user/team_create_form.php:27 ../user/team_create_form.php:32
+#: ../user/team_create_form.php:29 ../user/team_create_form.php:34
 msgid "Create a team"
 msgstr "Créer une équipe"
 
-#: ../user/team_create_form.php:30
+#: ../user/team_create_form.php:32
 msgid ""
 "You belong to %1. You must %2quit this team%3 before creating a new one."
 msgstr "Vous appartenez à l'équipe %1. Vous devez %2quitter cette équipe%3 avant d'en créer une."
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
 msgstr "Aucun fondateur ou administrateur"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
 msgstr "Historique d'équipe pour %1"
 
-#: ../user/team_delta.php:75
+#: ../user/team_delta.php:76
 msgid "When"
 msgstr "Quand"
 
-#: ../user/team_delta.php:76
+#: ../user/team_delta.php:77
 msgid "User"
 msgstr "Utilisateur"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
 msgstr "Action"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
 msgstr "Crédit total au moment de l'action"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
 msgstr "pays invalide"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
 msgstr "Le nom '%1' est déjà utilisé par une autre équipe."
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
 msgstr "Doit spécifier un nom d'équipe"
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
 msgstr "Impossible de mettre à jour l'équipe. Réessayez plus tard."
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
 msgstr "Éditer %1"
 
-#: ../user/team_edit_form.php:34
+#: ../user/team_edit_form.php:36
 msgid "Update team info"
 msgstr "Mettre à jour les informations d'équipe"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
 msgstr "Liste des e-mails de %1"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr "Liste des membres de %1"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
 msgstr "Afficher en clair"
 
-#: ../user/team_forum.php:28 ../user/team_forum.php:39
+#: ../user/team_forum.php:30 ../user/team_forum.php:41
 msgid "Create Message Board"
 msgstr "Créer un forum"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
 msgstr "Vous pouvez créer un forum relatif à %1."
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
 msgstr "Seuls les membres de l'équipe pourront poster dans le forum."
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
 msgstr "Selon votre choix, seuls les membres pourront lire."
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
 msgstr "Vous et les administrateurs de votre équipe auront les privilèges de modérateur."
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "Créer un forum pour %1"
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
 msgstr "L'équipe a déjà un forum"
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
 msgstr "Forum de l'équipe"
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
 msgstr "Délai minimum entre les dépôts de messages (en secondes)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "Crédit total minimum pour pouvoir poster"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "Crédit moyen minimum pour pouvoir poster"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
 msgstr "Soumettre"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
 msgstr "Supprimer le forum de votre équipe."
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
 msgstr "Voulez-vous vraiment supprimer le forum de votre équipe ?"
 
-#: ../user/team_forum.php:98
+#: ../user/team_forum.php:100
 msgid ""
 "Are you sure you want to remove your team's message board? All threads and "
 "posts will be permanently removed. (You may, however, create a new message "
 "board later)."
 msgstr "Êtes-vous sûr de vouloir supprimer le forum de votre équipe ? Tous les fils et messages seront alors définitivement supprimés. (Vous aurez néanmoins la possibilité de créer un nouveau forum ensuite)."
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
 msgstr "Oui - supprimer le forum"
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
 msgstr "Le forum a été supprimé"
 
-#: ../user/team_forum.php:124
+#: ../user/team_forum.php:126
 msgid ""
 "Your team's message board has been removed. You may now %1create a new "
 "one%2."
 msgstr "Le forum de votre équipe a été supprimé. Vous pouvez éventuellement en %1créer un nouveau%2."
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
 msgstr "Le forum de l'équipe a été mis à jour"
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
 msgstr "Mis à jour avec succès"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
 msgstr "Échec de la mise à jour"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "L'équipe n'a pas de forum"
 
-#: ../user/team_founder_transfer_action.php:36
+#: ../user/team_founder_transfer_action.php:38
 msgid "You must be a member of a team to access this page."
 msgstr "Vous devez être membre d'une équipe pour pouvoir accéder à cette page."
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
 msgstr "Demande en cours du titre de fondateur pour %1"
 
-#: ../user/team_founder_transfer_action.php:98
+#: ../user/team_founder_transfer_action.php:100
 msgid ""
 "The current founder has been notified of your request by email and private message.<br /><br />\n"
 "                       If the founder does not respond within 60 days you will be allowed to become the founder."
 msgstr "Le fondateur actuel a été notifié de votre demande par un e-mail et un message privé.<br /><br />\n                       Si le fondateur ne répond pas dans les 60 jours, vous serez alors autorisé à devenir le fondateur."
 
-#: ../user/team_founder_transfer_action.php:102
-#: ../user/team_founder_transfer_action.php:113
+#: ../user/team_founder_transfer_action.php:104
+#: ../user/team_founder_transfer_action.php:115
 msgid "Foundership request not allowed now"
 msgstr "Les requêtes pour le titre de fondateur ne sont pas autorisées actuellement."
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
 msgstr "Titre de fondateur assumé pour %1"
 
-#: ../user/team_founder_transfer_action.php:111
+#: ../user/team_founder_transfer_action.php:113
 msgid ""
 "Congratulations, you are now the founder of team %1. Go to %2Your Account "
 "page%3 to find the Team Admin options."
 msgstr "Félicitations ! Vous êtes maintenant le fondateur de l'équipe %1. Allez sur %2la page de votre compte%3 pour y trouver les options d'administration."
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
 msgstr "Refuser la requête de changement de fondateur"
 
-#: ../user/team_founder_transfer_action.php:127
+#: ../user/team_founder_transfer_action.php:129
 msgid "The foundership request from %1 has been declined."
 msgstr "La requête de titre de fondateur de %1 a été rejetée."
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
 msgstr "Il n'y a aucune requête de titre de fondateur."
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
 msgstr "action non-définie %1"
 
-#: ../user/team_founder_transfer_action.php:137
-#: ../user/team_founder_transfer_form.php:83
+#: ../user/team_founder_transfer_action.php:139
+#: ../user/team_founder_transfer_form.php:85
 msgid "Return to team page"
 msgstr "Retour à la page principale"
 
-#: ../user/team_founder_transfer_form.php:28
+#: ../user/team_founder_transfer_form.php:30
 msgid "You need to be a member of a team to access this page."
 msgstr "Vous devez être membre d'une équipe pour accéder à cette page."
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
 msgstr "Demande le titre de fondateur pour %1"
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
 msgstr "Vous avez maintenant le titre de fondateur de %1."
 
-#: ../user/team_founder_transfer_form.php:44
+#: ../user/team_founder_transfer_form.php:46
 msgid "You requested the foundership of %1 on %2."
 msgstr "Vous avez demandé le titre de fondateur de %1 le %2."
 
-#: ../user/team_founder_transfer_form.php:47
+#: ../user/team_founder_transfer_form.php:49
 msgid ""
 "60 days have elapsed since your request, and the founder has not responded. "
 "You may now assume foundership by clicking here:"
 msgstr "Soixante jours se sont écoulés depuis votre requête et le fondateur n'a pas répondu. Vous pouvez maintenant prendre le titre de fondateur en cliquant ici :"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
 msgstr "Prendre le titre de fondateur"
 
-#: ../user/team_founder_transfer_form.php:54
+#: ../user/team_founder_transfer_form.php:56
 msgid ""
 "The founder was notified of your request. If he/she does not respond by %1 "
 "you will be given an option to become founder."
 msgstr "Le fondateur a été notifié de votre requête. S'il ne répond pas dans les %1, il vous sera proposé une option pour devenir le fondateur."
 
-#: ../user/team_founder_transfer_form.php:60
+#: ../user/team_founder_transfer_form.php:62
 msgid ""
 "If the team founder is not active and you want to assume the role of founder, click the button below. The current founder will be sent an email detailing your request, and will be able to transfer foundership to you or to decline your request. If the founder does not respond in 60 days, you will be allowed to become the founder.<br /><br />\n"
 "                       Are you sure you want to request foundership?"
 msgstr "Si le fondateur de l'équipe n'est pas actif et que vous voulez assumer ce rôle, cliquer sur le bouton ci-dessous. Un e-mail sera envoyé au fondateur actuel pour détailler votre requête. Il pourra alors vous transférer le titre de fondateur ou refuser votre requête. Si le fondateur ne répond pas dans les 60 jours, vous serez alors autorisé à devenir fondateur.<br /><br />\n                       Voulez-vous vraiment demander le titre de fondateur ?"
 
-#: ../user/team_founder_transfer_form.php:65
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
 msgstr "Demander le titre de fondateur"
 
-#: ../user/team_founder_transfer_form.php:74
+#: ../user/team_founder_transfer_form.php:76
 msgid "Founder change has already been requested by %1 on %2."
 msgstr "Une demande de changement de fondateur a déjà été effectuée par %1 le %2."
 
-#: ../user/team_founder_transfer_form.php:77
+#: ../user/team_founder_transfer_form.php:79
 msgid ""
 "A foundership change was requested during the last 90 days, so new requests "
 "are not allowed. Please try again later."
 msgstr "Un changement de fondateur a été demandé dans les 90 derniers jours : aucune nouvelle requête n'est donc autorisée. Veuillez réessayer ultérieurement."
 
-#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
+#: ../user/team_join.php:34 ../user/team_join_action.php:34
+#: ../user/team_join_form.php:31
 msgid "The team %1 is not joinable."
 msgstr "L'équipe %1 ne peut être rejointe."
 
-#: ../user/team_join.php:35 ../user/team_join_action.php:35
+#: ../user/team_join.php:37 ../user/team_join_action.php:37
 msgid "Already a member"
 msgstr "Déjà un membre"
 
-#: ../user/team_join.php:36 ../user/team_join_action.php:36
+#: ../user/team_join.php:38 ../user/team_join_action.php:38
 msgid "You are already a member of %1."
 msgstr "Vous êtes déjà membre de %1."
 
-#: ../user/team_join.php:42 ../user/team_join_action.php:43
+#: ../user/team_join.php:44 ../user/team_join_action.php:45
 msgid "Couldn't join team - please try again later."
 msgstr "Impossible de rejoindre l'équipe - veuillez réessayer ultérieurement."
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
 msgstr "A rejoint %1"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr "Vous avez rejoint %1."
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr "Rejoindre %1"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
 msgstr "Veuillez noter :"
 
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:37
 msgid "Joining a team gives its founder access to your email address."
 msgstr "Rejoindre une équipe donne à son fondateur l'accès à votre adresse e-mail."
 
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
 msgstr "Rejoindre une équipe ne modifie pas le crédit sur votre compte."
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
 msgstr "Rejoindre l'équipe"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
 msgstr "Résultats pour la recherche de '%1'"
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
 msgstr "Vous pouvez voir les membres, les statistiques et les informations de ces équipes."
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
 msgstr "Plus de 100 équipes correspondent à vos critères de recherche. Seules les 100 premières sont affichées."
 
-#: ../user/team_lookup.php:104
+#: ../user/team_lookup.php:106
 msgid ""
 "End of results. %1 If you cannot find the team you are looking for, you may "
 "%2create a team%3 yourself."
 msgstr "Fin des résultats. %1 Si vous ne pouvez pas trouver l'équipe que vous recherchez, vous pouvez %2créer une équipe%3 par vous même."
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr "Administration de l'équipe %1"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
 msgstr "Éditer les informations d'équipe"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
 msgstr "Modifier le nom d'équipe, URL, description, type ou pays"
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
 msgstr "Liste des membres :"
 
-#: ../user/team_manage.php:33 ../user/team_manage.php:37
+#: ../user/team_manage.php:35 ../user/team_manage.php:39
 msgid "HTML"
 msgstr "HTML"
 
-#: ../user/team_manage.php:34
+#: ../user/team_manage.php:36
 msgid "text"
 msgstr "texte"
 
-#: ../user/team_manage.php:35
+#: ../user/team_manage.php:37
 msgid "View member names and email addresses"
 msgstr "Voir le nom des membres et leur adresse e-mail"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
 msgstr "Historique des changements d'affichage :"
 
-#: ../user/team_manage.php:38
+#: ../user/team_manage.php:40
 msgid "XML"
 msgstr "XML"
 
-#: ../user/team_manage.php:39
+#: ../user/team_manage.php:41
 msgid "See when members joined or quit this team"
 msgstr "Voir quand les membres on rejoint ou quitté cette équipe"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
 msgstr "Répondre à une requête de titre de fondateur."
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
 msgstr "Si vous ne répondez pas par %1, %2 pourra obtenir le titre de fondateur de cette équipe."
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
 msgstr "Supprimer de cette équipe les membres inactifs ou non désirés"
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
 msgstr "Transférer le titre de fondateur à un autre membre"
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
 msgstr "Ajouter/Supprimer un administrateur de l'équipe"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
 msgstr "Donner les privilèges d'administrateur de l'équipe aux membres sélectionnés"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
 msgstr "Supprimer l'équipe"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
 msgstr "Autorisé uniquement si l'équipe ne possède aucun membre"
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
 msgstr "Créer ou gérer un forum d'équipe"
 
-#: ../user/team_manage.php:71
+#: ../user/team_manage.php:73
 msgid ""
 "To have this team created on all BOINC projects (current and future) you can"
 " make it into a %1BOINC-wide team%2."
 msgstr "Pour avoir cette équipe présente sur tous les projets BOINC (présents et futurs), vous pouvez la qualifier %1d'équipe générale BOINC%2."
 
-#: ../user/team_manage.php:73
+#: ../user/team_manage.php:75
 msgid ""
 "Team admins are encouraged to join and participate in the Google %1boinc-"
 "team-founders%2 group."
 msgstr "Les administrateurs d'équipe sont encouragés à rejoindre et à participer au groupe Google %1boinc-team-founders%2."
 
-#: ../user/team_manage.php:75
-msgid ""
-"Other resources for BOINC team admins are available from a third-party site,"
-" %1www.boincteams.com%2."
-msgstr "D'autres ressources pour les administrateurs d'équipe BOINC sont disponibles sur le site tiers : %1www.boincteams.com%2."
-
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
 msgstr "Impossible de supprimer une équipe non vide"
@@ -6053,27 +6030,27 @@ msgstr "Impossible de supprimer une équipe non vide"
 msgid "Team %1 deleted"
 msgstr "L'équipe %1 a été supprimée"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr "Limite dépassée : seuls les 1000 premiers membres peuvent être affichés."
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
 msgstr "Membres de %1"
 
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
 msgid "Unable to quit team"
 msgstr "Impossible de quitter l'équipe"
 
-#: ../user/team_quit_action.php:33
+#: ../user/team_quit_action.php:35
 msgid "Team doesn't exist, or you don't belong to it."
 msgstr "L'équipe n'existe pas, ou vous n'en êtes pas membre."
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
 msgstr "Quitter %1"
 
-#: ../user/team_quit_form.php:32
+#: ../user/team_quit_form.php:34
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
@@ -6082,85 +6059,85 @@ msgid ""
 "         </ul>"
 msgstr "<strong>Avant de quitter une équipe, veuillez noter :</strong>\n         <ul>\n         <li>Si vous quittez une équipe, vous pourrez la rejoindre à nouveau ultérieurement, ou rejoindre une autre équipe.\n         <li>Quitter une équipe ne modifie aucunement les statistiques de votre crédit personnel.\n          </ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
 msgstr "Quitter l'équipe"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
 msgstr "Enlever les utilisateurs de %1"
 
-#: ../user/team_remove_inactive_action.php:39
+#: ../user/team_remove_inactive_action.php:41
 msgid "%1 is not a member of %2"
 msgstr "%1 n'est pas membre de %2"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr "%1 a été enlevé"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr "Enlever les membres de %1"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
 msgstr "Enlever ?"
 
-#: ../user/team_remove_inactive_form.php:40
+#: ../user/team_remove_inactive_form.php:42
 msgid "Name (ID)"
 msgstr "Nom (ID)"
 
-#: ../user/team_remove_inactive_form.php:65
+#: ../user/team_remove_inactive_form.php:67
 msgid "No members are eligible for removal."
 msgstr "Aucun membre n'est éligible pour la suppression."
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
 msgstr "Enlever les utilisateurs"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
 msgstr "Nom d'équipe"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
 msgstr "Résultats de la recherche d'équipe"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
 msgstr "Aucune équipe correspondant à vos critères n'a été trouvée. Essayez une autre recherche."
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
 msgstr "Sinon vous pouvez %1créer une nouvelle équipe%2."
 
-#: ../user/team_search.php:100
+#: ../user/team_search.php:121
 msgid ""
 "The following teams match one or more of your search criteria.\n"
 "            To join a team, click its name to go to the team page,\n"
 "               then click %1Join this team%2."
 msgstr "Les équipes suivantes correspondent à au moins un critère de votre recherche.\n            Pour rejoindre une équipe, cliquer sur son nom aller sur la page de l'équipe,\n            ensuite cliquer %1Rejoindre cette équipe%2."
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
 msgstr "Modifier votre recherche"
 
-#: ../user/team_search.php:181
+#: ../user/team_search.php:202
 msgid ""
 "You can team up with other people with similar interests, or from the same "
 "country, company, or school."
 msgstr "Vous pouvez constituer une équipe avec d'autres personnes ayant des intérêts similaires, ou d'un même pays, d'une même compagnie, ou bien encore d'une même école."
 
-#: ../user/team_search.php:183
+#: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
 msgstr "Utiliser ce formulaire pour trouver des équipes qui peuvent vous correspondre."
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
 msgstr "%1Je ne suis pas intéressé%2 pour rejoindre une équipe maintenant."
 
-#: ../user/top_hosts.php:67 ../user/top_teams.php:100
-#: ../user/top_users.php:112
+#: ../user/top_hosts.php:67 ../user/top_teams.php:102
+#: ../user/top_users.php:113
 msgid "Limit exceeded - Sorry, first %1 items only"
 msgstr "Limite dépassée - Désolé, mais seulement les %1 items"
 
@@ -6168,11 +6145,11 @@ msgstr "Limite dépassée - Désolé, mais seulement les %1 items"
 msgid "Top hosts"
 msgstr "Top des hôtes"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "Top %1 des équipes"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "In n'y a pas %1 équipes"
 
@@ -6180,11 +6157,11 @@ msgstr "In n'y a pas %1 équipes"
 msgid "Participant since"
 msgstr "Participant depuis"
 
-#: ../user/uotd.php:29
+#: ../user/uotd.php:31
 msgid "No user of the day has been chosen."
 msgstr "Aucun 'utilisateur du jour' n'a été choisi."
 
-#: ../user/uotd.php:33
+#: ../user/uotd.php:35
 msgid "User of the Day for %1: %2"
 msgstr "Utilisateur du jour pour %1 : %2"
 
@@ -6228,19 +6205,19 @@ msgstr "Crédit moyen décroissant"
 msgid "Decreasing total credit"
 msgstr "Crédit total décroissant"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
 msgstr "la chaîne doit contenir au moins 3 caractères"
 
-#: ../user/user_search.php:133
+#: ../user/user_search.php:118
 msgid "User search results"
 msgstr "Résultats de la recherche d'utilisateur"
 
-#: ../user/user_search.php:140
+#: ../user/user_search.php:125
 msgid "Joined"
 msgstr "Rejoint"
 
-#: ../user/user_search.php:148
+#: ../user/user_search.php:133
 msgid "No users match your search criteria."
 msgstr "Aucun utilisateur ne correspond aux critères de recherche."
 
@@ -6308,15 +6285,15 @@ msgstr "Valider l'adresse e-mail"
 msgid "The email address of your account has been validated."
 msgstr "L'adresse e-mail de votre compte a été validée."
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
 msgstr "Cet utilisateur n'a pas de profil"
 
-#: ../user/view_profile.php:54
+#: ../user/view_profile.php:56
 msgid "Profile: %1"
 msgstr "Profil : %1"
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
 msgstr "Données de compte"
 
@@ -6370,6 +6347,10 @@ msgstr "impossible de trouver l'unité de travail"
 msgid "Workunit %1"
 msgstr "Unité de travail %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "applications"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "résultats canoniques"
@@ -6379,6 +6360,10 @@ msgid "granted credit"
 msgstr "crédit accordé"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Tâches en cours"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "Suppression en cours"
 
@@ -6406,33 +6391,33 @@ msgstr "validation"
 msgid "Pending"
 msgstr "En attente"
 
-#: ../project.sample/project.inc:43
+#: ../project.sample/project.inc:70
 msgid "Main page"
 msgstr "Page principale"
 
-#: ../project.sample/project.inc:45
+#: ../project.sample/project.inc:72
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../project.sample/project.inc:48
+#: ../project.sample/project.inc:75
 msgid "Generated"
 msgstr "Généré"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
 msgstr "Votre parcours personnel."
 
-#: ../project.sample/project.inc:83
+#: ../project.sample/project.inc:110
 msgid ""
 "Tell us about yourself. You could tell us where you're from, your age, "
 "occupation, hobbies, or anything else about yourself."
 msgstr "Parlez-nous de vous. Vous pouvez nous dire d'où vous venez, votre âge, vos occupations et hobbies, ou toutes autres choses vous concernant."
 
-#: ../project.sample/project.inc:87
+#: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
 msgstr "Votre opinion concernant %1"
 
-#: ../project.sample/project.inc:91
+#: ../project.sample/project.inc:118
 msgid ""
 "Tell us your thoughts about %1<ol>\n"
 "    <li>Why do you run %1?\n"
@@ -6441,24 +6426,35 @@ msgid ""
 "    </ol>"
 msgstr "Dites nous vos pensées à propos de %1<ol>\n    <li>Pourquoi utilisez vous %1?\n    <li>Quel est votre point de vue à propos du projet ?\n    <li>Des suggestions ?\n    </ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
 msgstr "Combinaison de couleurs des graphismes"
 
-#: ../project.sample/project_specific_prefs.inc:48
+#: ../project.sample/project_specific_prefs.inc:55
+#, no-php-format
 msgid "Maximum CPU % for graphics%10 ... 100%2"
 msgstr "Pourcentage maximal de CPU pour les graphiques %10 ... 100%2"
 
-#: ../project.sample/project_specific_prefs.inc:49
+#: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
 msgstr "Utiliser uniquement les applications sélectionnées"
 
-#: ../project.sample/project_specific_prefs.inc:50
+#: ../project.sample/project_specific_prefs.inc:57
+msgid ""
+"Only get tasks for certain applications. Useful to focus on particular "
+"applications, or to exclude them."
+msgstr "Ne recevoir du travail que pour certaines applications. Utile pour se concentrer sur certaines applications, ou pour en exclure."
+
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
 msgstr "Si aucun travail n'est disponible pour les applications sélectionnées, autoriser des travaux pour d'autres applications ? "
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "Utilisez une application non graphique plus rapide, si disponible ? "
+
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
 msgstr "(toutes les applications)"
diff --git a/locale/fr/BOINC-Setup.mo b/locale/fr/BOINC-Setup.mo
index 4d7112a..b8219ce 100644
Binary files a/locale/fr/BOINC-Setup.mo and b/locale/fr/BOINC-Setup.mo differ
diff --git a/locale/fr/BOINC-Setup.po b/locale/fr/BOINC-Setup.po
old mode 100755
new mode 100644
index 95b4eb8..834b09b
--- a/locale/fr/BOINC-Setup.po
+++ b/locale/fr/BOINC-Setup.po
@@ -1,33 +1,26 @@
 # 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 at ADDRESS>, YEAR.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2014-02-02 21:30+0000\n"
-"Last-Translator: Jerome Cadet <jerome.cadet at pobox.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: fr\n"
+"PO-Revision-Date: 2015-04-20 12:34+0000\n"
+"Last-Translator: Rom Walton\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-Poedit-SearchPath-0: mac_installer\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: /Volumes/Cheer/BOINC_GIT/boinc_trunk\n"
-"X-POOTLE-MTIME: 1391376604.0\n"
-"X-Poedit-KeywordsList: _\n"
 
 #: Installer.cpp:124
 #, c-format
 msgid "Sorry, this version of %s requires system 10.5 or higher."
-msgstr ""
-"Veuillez nous excuser, cette version de %s requiert un système 10.5 ou "
-"supérieur."
+msgstr "Veuillez nous excuser, cette version de %s requiert un système 10.5 ou supérieur."
 
 #: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
 msgid "Yes"
@@ -44,24 +37,15 @@ msgstr "BOINC doit-il fonctionner même lorsqu'aucun utilisateur n'est connecté
 #: PostInstall.cpp:1416
 #, c-format
 msgid ""
-"Users who are permitted to administer this computer will automatically be "
-"allowed to run and control %s.\n"
-"\n"
-"Do you also want non-administrative users to be able to run and control %s "
-"on this Mac?"
-msgstr ""
-"Les utilisateurs ayant les privilèges administrateurs sur cet ordinateur "
-"seront automatiquement autorisés à exécuter et contrôler %s.\n"
+"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
 "\n"
-"Voulez-vous aussi autoriser les utilisateurs non-administrateurs à exécuter "
-"et contrôler %s sur ce Mac ?"
+"Do you also want non-administrative users to be able to run and control %s on this Mac?"
+msgstr "Les utilisateurs ayant les privilèges administrateurs sur cet ordinateur seront automatiquement autorisés à exécuter et contrôler %s.\n\nVoulez-vous aussi autoriser les utilisateurs non-administrateurs à exécuter et contrôler %s sur ce Mac ?"
 
 #: PostInstall.cpp:1444
 #, c-format
 msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
-msgstr ""
-"Voulez-vous établir %s comme économiseur d'écran pour tous les utilisateurs "
-"%s sur ce Mac ?"
+msgstr "Voulez-vous établir %s comme économiseur d'écran pour tous les utilisateurs %s sur ce Mac ?"
 
 #: uninstall.cpp:82
 msgid "OK"
@@ -75,9 +59,7 @@ msgstr "Erreur de droit d'accès après un redémarrage"
 msgid ""
 "Removal may take several minutes.\n"
 "Please be patient."
-msgstr ""
-"La suppression peut durer plusieurs minutes.\n"
-"Veuillez patienter."
+msgstr "La suppression peut durer plusieurs minutes.\nVeuillez patienter."
 
 #: uninstall.cpp:156
 #, c-format
@@ -85,11 +67,7 @@ msgid ""
 "Are you sure you want to completely remove %s from your computer?\n"
 "\n"
 "This will remove the executables but will not touch %s data files."
-msgstr ""
-"Êtes-vous certain de vouloir supprimer %s de votre ordinateur ?\n"
-"\n"
-"Cela supprimera les fichiers exécutables mais pas les fichiers de données %"
-"s."
+msgstr "Êtes-vous certain de vouloir supprimer %s de votre ordinateur ?\n\nCela supprimera les fichiers exécutables mais pas les fichiers de données %s."
 
 #: uninstall.cpp:163
 #, c-format
@@ -109,9 +87,7 @@ msgstr "nom d'utilisateur"
 msgid ""
 "Do you also want to remove VirtualBox from your computer?\n"
 "(VirtualBox was installed along with BOINC.)"
-msgstr ""
-"Voulez-vous également supprimer VirtualBox de votre ordinateur?\n"
-"(VirtualBox a été installé en même temps que BOINC)"
+msgstr "Voulez-vous également supprimer VirtualBox de votre ordinateur?\n(VirtualBox a été installé en même temps que BOINC)"
 
 #: uninstall.cpp:312
 #, c-format
@@ -123,26 +99,14 @@ msgid ""
 "\n"
 "for each user, the file\n"
 "\"%s\"."
-msgstr ""
-"Suppression effectuée.\n"
-"\n"
-"Vous voulez peut-être supprimer les éléments restants suivants en utilisant "
-"l'outil de recherche: \n"
-"le répertoire \"%s\"\n"
-"\n"
-"pour chaque utilisateur, le fichier\n"
-"\"%s\"."
+msgstr "Suppression effectuée.\n\nVous voulez peut-être supprimer les éléments restants suivants en utilisant l'outil de recherche: \nle répertoire \"%s\"\n\npour chaque utilisateur, le fichier\n\"%s\"."
 
 #: uninstall.cpp:840
 #, c-format
 msgid ""
-"Enter your administrator password to completely remove %s from you "
-"computer.\n"
-"\n"
-msgstr ""
-"Inscrivez votre mot de passe administrateur pour effacer complètement %s de "
-"votre ordinateur. \n"
+"Enter your administrator password to completely remove %s from you computer.\n"
 "\n"
+msgstr "Inscrivez votre mot de passe administrateur pour effacer complètement %s de votre ordinateur. \n\n"
 
 #: uninstall.cpp:1616
 msgid "Cancel"
diff --git a/locale/it_IT/BOINC-Manager.mo b/locale/it_IT/BOINC-Manager.mo
index abc0aef..eadb856 100644
Binary files a/locale/it_IT/BOINC-Manager.mo and b/locale/it_IT/BOINC-Manager.mo differ
diff --git a/locale/it_IT/BOINC-Manager.po b/locale/it_IT/BOINC-Manager.po
index 4ac069b..80a3e0e 100644
--- a/locale/it_IT/BOINC-Manager.po
+++ b/locale/it_IT/BOINC-Manager.po
@@ -8,8 +8,8 @@ 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-03-24 21:39+0000\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-04 09:03+0000\n"
 "Last-Translator: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/boinc/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\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
@@ -175,6 +175,8 @@ msgstr "Apri la pagina web"
 msgid "Visit this account manager's web site"
 msgstr "Visita il sito web del gestore account"
 
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
 #: clientgui/AccountManagerProcessingPage.cpp:186
 #: clientgui/AccountManagerPropertiesPage.cpp:192
 #, c-format
@@ -203,364 +205,369 @@ msgstr "Connesso"
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: clientgui/AdvancedFrame.cpp:325
+#: clientgui/AdvancedFrame.cpp:327
 #, c-format
 msgid "New %s window..."
 msgstr "Nuova finestra %s ..."
 
-#: clientgui/AdvancedFrame.cpp:329
+#: clientgui/AdvancedFrame.cpp:331
 #, c-format
 msgid "Open another %s window"
 msgstr "Avvia una nuova finestra di %s"
 
-#: clientgui/AdvancedFrame.cpp:340
+#: clientgui/AdvancedFrame.cpp:342
 msgid "Select computer..."
 msgstr "Seleziona un computer..."
 
-#: clientgui/AdvancedFrame.cpp:341
+#: clientgui/AdvancedFrame.cpp:343
 msgid "Connect to a BOINC client on another computer"
 msgstr "Connetti ad un client BOINC su un altro computer"
 
-#: clientgui/AdvancedFrame.cpp:345
+#: clientgui/AdvancedFrame.cpp:347
 msgid "Shut down connected client..."
 msgstr "Arresta il client attualmente connesso..."
 
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:348
 msgid "Shut down the currently connected BOINC client"
 msgstr "Arresta tutti i client BOINC attualmente connessi"
 
-#: clientgui/AdvancedFrame.cpp:351
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
 #, c-format
 msgid "Close the %s window"
 msgstr "Chiudi la finestra di %s"
 
-#: clientgui/AdvancedFrame.cpp:354
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
 msgid "&Close window"
 msgstr "&Chiudi finestra"
 
-#: 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 "Esci da %s"
 
-#: clientgui/AdvancedFrame.cpp:386
-msgid "Preferences…"
+#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+msgid "Preferences..."
 msgstr "Preferenze..."
 
-#: clientgui/AdvancedFrame.cpp:395
+#: clientgui/AdvancedFrame.cpp:398
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Avvisi\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:396
+#: clientgui/AdvancedFrame.cpp:399
 msgid "Show notices"
 msgstr "Visualizza notifiche"
 
-#: clientgui/AdvancedFrame.cpp:401
+#: clientgui/AdvancedFrame.cpp:404
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Progetti\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:402
+#: clientgui/AdvancedFrame.cpp:405
 msgid "Show projects"
 msgstr "Mostra i progetti"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: clientgui/AdvancedFrame.cpp:410
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Elaborazioni\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:408
+#: clientgui/AdvancedFrame.cpp:411
 msgid "Show tasks"
 msgstr "Visualizza le elaborazioni"
 
-#: clientgui/AdvancedFrame.cpp:413
+#: clientgui/AdvancedFrame.cpp:416
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Tras&ferimenti\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:414
+#: clientgui/AdvancedFrame.cpp:417
 msgid "Show file transfers"
 msgstr "Visualizza i trasferimenti dei file"
 
-#: clientgui/AdvancedFrame.cpp:419
+#: clientgui/AdvancedFrame.cpp:422
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Statistiche\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:420
+#: clientgui/AdvancedFrame.cpp:423
 msgid "Show statistics"
 msgstr "Visualizza le statistiche"
 
-#: clientgui/AdvancedFrame.cpp:425
+#: clientgui/AdvancedFrame.cpp:428
 msgid "&Disk\tCtrl+Shift+D"
 msgstr "Utilizzo &disco⇥Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:429
 msgid "Show disk usage"
 msgstr "Visualizza utilizzo disco"
 
-#: clientgui/AdvancedFrame.cpp:432
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Lista degli eventi...\t Ctrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:433
-msgid "Show diagnostic messages"
-msgstr "Visualizza messaggi diagnostici"
-
-#: clientgui/AdvancedFrame.cpp:439
+#: clientgui/AdvancedFrame.cpp:436
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Visualizzazione Semplice...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:437
 msgid "Switch to the Simple View"
 msgstr "Passa alla Vista Semplice"
 
-#: clientgui/AdvancedFrame.cpp:454
-msgid "&Add project or account manager..."
-msgstr "Connessione ad un &progetto o ad un account manager..."
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
+msgstr "&Connessione ad un progetto..."
+
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "Connessione ad un progetto"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "&Usa un account manager..."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "Aggiungi un nuovo progetto, oppure usa un account manager"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "Usa un account manager per controllare questo computer."
 
-#: clientgui/AdvancedFrame.cpp:459
+#: clientgui/AdvancedFrame.cpp:461
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronizza con %s"
 
-#: clientgui/AdvancedFrame.cpp:463
+#: clientgui/AdvancedFrame.cpp:465
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Preleva le impostazioni correnti da %s"
 
-#: clientgui/AdvancedFrame.cpp:473
-msgid "&Add project..."
-msgstr "&Connessione ad un progetto..."
-
-#: clientgui/AdvancedFrame.cpp:474
-msgid "Add a project"
-msgstr "Connessione ad un progetto"
-
-#: clientgui/AdvancedFrame.cpp:477
+#: clientgui/AdvancedFrame.cpp:479
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Smetti di utilizzare %s..."
 
-#: clientgui/AdvancedFrame.cpp:483
+#: clientgui/AdvancedFrame.cpp:485
 msgid "Remove this computer from account manager control."
 msgstr "Rimuovi questo computer dal controllo dell'account manager."
 
-#: clientgui/AdvancedFrame.cpp:489
+#: clientgui/AdvancedFrame.cpp:491
 msgid "Run CPU &benchmarks"
 msgstr "Esegui i &benchmark per la CPU"
 
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:492
 msgid "Run tests that measure CPU speed"
 msgstr "Avvia i test di misurazione della velocità CPU"
 
-#: clientgui/AdvancedFrame.cpp:494
+#: clientgui/AdvancedFrame.cpp:496
 msgid "Retry pending transfers"
 msgstr "Ritenta i trasferimenti in attesa"
 
-#: clientgui/AdvancedFrame.cpp:495
+#: clientgui/AdvancedFrame.cpp:497
 msgid "Retry deferred file transfers and task requests"
 msgstr "Ritenta i trasferimenti e le richieste di nuove elaborazioni rimandate"
 
+#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "Lista degli eventi...\t Ctrl+Shift+E"
+
 #: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr "Visualizza messaggi diagnostici"
+
+#: clientgui/AdvancedFrame.cpp:511
 msgid "&Run always"
 msgstr "Elabo&razione continua"
 
-#: clientgui/AdvancedFrame.cpp:504
+#: clientgui/AdvancedFrame.cpp:512
 msgid "Allow work regardless of preferences"
 msgstr "Elabora senza interruzioni e indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:508
+#: clientgui/AdvancedFrame.cpp:516
 msgid "Run based on &preferences"
 msgstr "Elaborazione secondo le &preferenze"
 
-#: clientgui/AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:517
 msgid "Allow work according to preferences"
 msgstr "Consenti l'invio di lavoro secondo le preferenze"
 
-#: clientgui/AdvancedFrame.cpp:513
+#: clientgui/AdvancedFrame.cpp:521
 msgid "&Suspend"
 msgstr "&Sospendi"
 
-#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/AdvancedFrame.cpp:522
 msgid "Stop work regardless of preferences"
 msgstr "Sospendi l'elaborazione indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:539
+#: clientgui/AdvancedFrame.cpp:547
 msgid "Use GPU always"
 msgstr "E&laborazione GPU continua"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:548
 msgid "Allow GPU work regardless of preferences"
 msgstr "Elabora con la GPU senza interruzioni e indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:552
 msgid "Use GPU based on preferences"
 msgstr "Ela&borazione GPU secondo le preferenze"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:553
 msgid "Allow GPU work according to preferences"
 msgstr "consenti l'invio di lavoro per la GPU secondo le preferenze"
 
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:557
 msgid "Suspend GPU"
 msgstr "Sospendi l'uso della GPU"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:558
 msgid "Stop GPU work regardless of preferences"
 msgstr "Sospendi l'elaborazione della GPU indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:574
+#: clientgui/AdvancedFrame.cpp:582
 msgid "Network activity always allowed"
 msgstr "Attività di rete sempre permessa"
 
-#: clientgui/AdvancedFrame.cpp:575
+#: clientgui/AdvancedFrame.cpp:583
 msgid "Allow network activity regardless of preferences"
 msgstr "Permetti l'attività di rete senza interruzioni e indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:579
+#: clientgui/AdvancedFrame.cpp:587
 msgid "Network activity based on preferences"
 msgstr "Attività di rete secondo le pr&eferenze"
 
-#: clientgui/AdvancedFrame.cpp:580
+#: clientgui/AdvancedFrame.cpp:588
 msgid "Allow network activity according to preferences"
 msgstr "Permetti l'attività di rete secondo le preferenze"
 
-#: clientgui/AdvancedFrame.cpp:584
+#: clientgui/AdvancedFrame.cpp:592
 msgid "Network activity suspended"
 msgstr "Attività di rete s&ospesa"
 
-#: clientgui/AdvancedFrame.cpp:585
+#: clientgui/AdvancedFrame.cpp:593
 msgid "Stop BOINC network activity"
 msgstr "Sospendi l'attività di rete indipendentemente dalle preferenze"
 
-#: clientgui/AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
 msgid "Computing &preferences..."
 msgstr "&Preferenze di elaborazione..."
 
-#: clientgui/AdvancedFrame.cpp:595
+#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
 msgid "Configure computing preferences"
 msgstr "Configura le preferenze locali di elaborazione"
 
-#: clientgui/AdvancedFrame.cpp:600
+#: clientgui/AdvancedFrame.cpp:608
 msgid "Exclusive applications..."
 msgstr "Applicazioni esclusive..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: clientgui/AdvancedFrame.cpp:609
 msgid "Configure exclusive applications"
 msgstr "Configura applicazioni esclusive"
 
-#: clientgui/AdvancedFrame.cpp:606
+#: clientgui/AdvancedFrame.cpp:614
 msgid "Select columns..."
 msgstr "Seleziona colonne..."
 
-#: clientgui/AdvancedFrame.cpp:607
+#: clientgui/AdvancedFrame.cpp:615
 msgid "Select which columns to display"
 msgstr "Seleziona le colonne da visualizzare"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: clientgui/AdvancedFrame.cpp:619
 msgid "Event Log options...\tCtrl+Shift+F"
 msgstr "Opzioni Log Eventi...⇥Ctrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: clientgui/AdvancedFrame.cpp:620
 msgid "Enable or disable various diagnostic messages"
 msgstr "Abilita o disabilita vari messaggi di diagnostica"
 
-#: clientgui/AdvancedFrame.cpp:616
+#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
 msgid "&Other options..."
 msgstr "Altre &opzioni..."
 
-#: clientgui/AdvancedFrame.cpp:617
+#: clientgui/AdvancedFrame.cpp:625
 msgid "Configure display options and network settings"
 msgstr "Configura le opzioni del display e le impostazioni di rete"
 
-#: clientgui/AdvancedFrame.cpp:622
+#: clientgui/AdvancedFrame.cpp:630
 msgid "Read config files"
 msgstr "Leggi i file di configurazione"
 
-#: clientgui/AdvancedFrame.cpp:623
+#: clientgui/AdvancedFrame.cpp:631
 msgid ""
 "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Leggi la configurazione dal file cc_config.xml e dai file app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:627
+#: clientgui/AdvancedFrame.cpp:635
 msgid "Read local prefs file"
 msgstr "Leggi il file delle preferenze locali"
 
-#: clientgui/AdvancedFrame.cpp:628
+#: clientgui/AdvancedFrame.cpp:636
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Leggi le preferenze dal file global_prefs_override.xml"
 
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
 #, c-format
 msgid "%s &help"
 msgstr "&Aiuto su %s"
 
-#: clientgui/AdvancedFrame.cpp:640
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
 #, c-format
 msgid "Show information about %s"
 msgstr "Mostra le informazioni su %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:658
 #, c-format
 msgid "&%s help"
 msgstr "Aiuto sul &%s"
 
-#: clientgui/AdvancedFrame.cpp:654
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
 msgid "Show information about the %s"
 msgstr "Mostra le informazioni sul %s"
 
-#: clientgui/AdvancedFrame.cpp:665
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
 #, c-format
 msgid "%s &web site"
 msgstr "sito &web di %s"
 
-#: clientgui/AdvancedFrame.cpp:669
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Mostra le informazioni su BOINC e sul %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 "&Informazioni sul %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
 msgid "Licensing and copyright information."
 msgstr "Mostra le informazioni sulla licenza e sul copyright"
 
-#: clientgui/AdvancedFrame.cpp:693
+#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
 msgid "&File"
 msgstr "&File"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr "&Visualizza"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:709
 msgid "&Activity"
 msgstr "&Attività"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
 msgid "&Options"
 msgstr "&Opzioni"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
 msgid "&Tools"
 msgstr "&Strumenti"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr "A&iuto"
 
-#: clientgui/AdvancedFrame.cpp:1188
+#: clientgui/AdvancedFrame.cpp:1235
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Arresto nell'uso di %s"
 
-#: clientgui/AdvancedFrame.cpp:1193
+#: clientgui/AdvancedFrame.cpp:1240
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -570,39 +577,39 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr "Se tu finisci di usare %s,\nmanterrai tutti i tuoi progetti correnti,\nma dovrai gestirli manualmente.\n\nVuoi finire di usare %s?"
 
-#: clientgui/AdvancedFrame.cpp:1420
+#: clientgui/AdvancedFrame.cpp:1469
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Chiudi il client corrente..."
 
-#: 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 chiuderà il client attualmente connesso,\ne ti chiederà di indicarne un altro a cui connettersi."
 
-#: 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 ha aggiunto con successo %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 "Connessione a %s in corso"
 
-#: clientgui/AdvancedFrame.cpp:1984
+#: clientgui/AdvancedFrame.cpp:2033
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Connesso a %s (%s)"
@@ -650,7 +657,9 @@ msgstr "&Esci da %s"
 msgid "%s - Communication"
 msgstr "%s - Comunicazione"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -723,6 +732,7 @@ msgid ""
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr "%s al momento non è connesso al client %s.\nUsa l'opzione del menù 'Avanzate\\Seleziona un computer...' per connettersi al client %s.\nPer connetterti al computer locale usa 'localhost' come host name."
 
+#. Create the web sites task group
 #: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Siti web del progetto"
@@ -807,7 +817,8 @@ msgstr "La proprietà o i permessi di %s non sono impostati correttamente; per r
 msgid " at "
 msgstr "a"
 
-#: clientgui/BOINCGUIApp.cpp:612
+#: clientgui/BOINCGUIApp.cpp:612 clientgui/MainDocument.cpp:2494
+#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
 msgid ")"
 msgstr ")"
 
@@ -817,7 +828,7 @@ msgid ""
 "Please reboot your computer and try again."
 msgstr "Per un corretto funzionamento di BOINC è necessario riavviare il sistema.\nRiavvia e prova nuovamente."
 
-#: clientgui/BOINCGUIApp.cpp:643
+#: clientgui/BOINCGUIApp.cpp:643 clientgui/DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
@@ -869,6 +880,7 @@ msgstr "Sono consentite istanze multiple del BOINC Manager"
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Non utilizzato: workaround per il bug in XCode 4.2"
 
+#. These are just special tags so deal with them in a special way
 #: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Rilevazione automatica)"
@@ -891,13 +903,13 @@ msgstr "Apri %s Web..."
 msgid "Open %s..."
 msgstr "Apri %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 "Sospendi tutto"
 
-#: 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 "Ferma GPU"
 
@@ -905,52 +917,55 @@ msgstr "Ferma GPU"
 msgid "E&xit"
 msgstr "&Esci"
 
-#: 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 "Riprendi"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:649
 msgid "Resume GPU"
 msgstr "Riprendi GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: clientgui/BOINCTaskBar.cpp:715
 msgid "Computing is enabled"
 msgstr "L'elaborazione è abilitata"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: clientgui/BOINCTaskBar.cpp:719
 msgid "Computing is suspended - "
 msgstr "L'elaborazione è sospesa -"
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: clientgui/BOINCTaskBar.cpp:729
 msgid "GPU computing is enabled"
 msgstr "L'elaborazione della GPU è abilitata"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:732
 msgid "GPU computing is suspended - "
 msgstr "L'elaborazione della GPU è sospesa -."
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: clientgui/BOINCTaskBar.cpp:741
 msgid "Network is enabled"
 msgstr "La rete è abilitata"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: clientgui/BOINCTaskBar.cpp:744
 msgid "Network is suspended - "
 msgstr "L'attività di rete è sospesa -"
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: clientgui/BOINCTaskBar.cpp:752
 msgid "Reconnecting to client."
 msgstr "Riconnessione al client in corso."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: clientgui/BOINCTaskBar.cpp:754
 msgid "Not connected to a client."
 msgstr "Non connesso ad un client."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: clientgui/BOINCTaskBar.cpp:807
 #, c-format
 msgid "%s Notices"
 msgstr "Avvisi di %s"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: clientgui/BOINCTaskBar.cpp:813
 msgid "There are new notices - click to view."
 msgstr "Ci sono nuovi avvisi - clicca per vederli."
 
@@ -1009,6 +1024,7 @@ msgstr "Aggiornamento da %s completato."
 msgid "Update completed."
 msgstr "Aggiornamento completato."
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Ora, stai utilizzando l'account manager"
@@ -1055,48 +1071,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr "BOINC è distribuito sotto licenza GNU Lesser General Public License v3.0."
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr "Visita"
+msgid "For more information, visit "
+msgstr "Per ulteriori informazioni, visita"
 
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
-msgstr "per ulteriori informazioni."
-
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr "Numero non valido"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr "Tempo non valido, il valore deve essere compreso tra 0:00 e 24:00, il formato è HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:771
+msgid "Start time must be different from end time"
+msgstr "Il tempo di avvio deve essere diverso dal tempo di fine"
+
+#: clientgui/DlgAdvPreferences.cpp:685
 msgid "Number must be between 0 and 10"
 msgstr "Il numero deve essere compreso tra 0 e 10"
 
-#: clientgui/DlgAdvPreferences.cpp:672
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:772
 msgid "Number must be between 0 and 100"
 msgstr "I numeri devono essere compresi tra 0 e 100"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "trovato un valore inserito non valido"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 msgid "Validation Error"
 msgstr "Errore di validazione"
 
-#: clientgui/DlgAdvPreferences.cpp:1119
+#: clientgui/DlgAdvPreferences.cpp:1158
 msgid "Discard local preferences and use web-based preferences?"
 msgstr "Scartare le preferenze locali e utilizzare quelle web?"
 
-#: clientgui/DlgAdvPreferences.cpp:1120
+#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1171
 msgid "Confirmation"
 msgstr "Conferma"
 
@@ -1105,106 +1121,111 @@ msgstr "Conferma"
 msgid "%s - Computing preferences"
 msgstr "%s - Preferenze di elaborazione"
 
-#: 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 "Preferenze locali in uso.\nClicca \"Utilizza le preferenze web\" per utilizzare le preferenze web"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
 msgid "Using web-based preferences from"
 msgstr "Preferenze web in uso da"
 
-#: 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 "Imposta i valori e clicca OK per utilizzare le preferenze locali."
 
-#: 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 "Questa finestra controlla solo le preferenze di questo computer.\nClicca OK per impostare le preferenze.\nClicca Cancella per ripristinare le preferenze web."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: clientgui/DlgAdvPreferencesBase.cpp:119
 msgid "Clear"
 msgstr "Rimuovi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:115
+#: clientgui/DlgAdvPreferencesBase.cpp:120
 msgid "Clear all local preferences and close the dialog."
 msgstr "Cancella tutte le preferenze locali e chiudi la finestra."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
+#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:215
 msgid "Use web prefs"
 msgstr "Usa le preferenze web"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 msgid "Restore web-based preferences and close the dialog."
 msgstr "Ripristina le preferenze web e chiudi la finestra."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:143
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#. Computing schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:148
+#: clientgui/DlgAdvPreferencesBase.cpp:688
 msgid "Computing"
 msgstr "Computazione"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 msgid "Network"
 msgstr "Rete"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
+#: clientgui/DlgAdvPreferencesBase.cpp:154
 msgid "Disk and memory"
 msgstr "Disco e memoria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:152
+#: clientgui/DlgAdvPreferencesBase.cpp:157
 msgid "Daily schedules"
 msgstr "Programmazioni giornaliere"
 
-#: 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:347
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:166
+#: clientgui/DlgAdvPreferencesBase.cpp:171
 msgid "Save all values and close the dialog."
 msgstr "Salva tutti i valori e chiude la finestra."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:172
+#: clientgui/DlgAdvPreferencesBase.cpp:177
 msgid "Close the dialog without saving."
 msgstr "Chiudi la finestra senza salvare."
 
-#: 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:357
 msgid "Help"
 msgstr "Aiuto"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:182
 msgid "Shows the preferences web page."
 msgstr "Mostra la pagina web sulle preferenze"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:239
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:471
 msgid "Usage limits"
 msgstr "Limite di utilizzo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, no-c-format
 msgid ""
 "Keep some CPUs free for other applications. Example: 75% means use 6 cores "
 "on an 8-core CPU."
 msgstr "Mantieni alcune CPU libere per altre applicazioni. Esempio: 75% significa usa 6 core in una CPU a 8 core."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr "Usa al massimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% delle CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1212,342 +1233,355 @@ msgid ""
 "and repeat."
 msgstr "Sospendi/riprendi l'elaborazione ogni qualche secondo per ridurre la temperatura CPU e l'utilizzo di energia. Esempio: 75% significa elabora per 3 secondi, aspetta per 1 secondo, e ripeti."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% del tempo della CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr "Quando sospendere"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr "Sospendi quando il computer è alimentato a batteria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "Spunta questa voce per sospendere l'elaborazione degli smartphone quando funzionano a batteria."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr "Sospendi quando il computer è in uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "Spunta questa voce per sospendere l'elaborazione e i trasferimenti di file quando stai usando il computer."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
 msgstr "Sospendo l'elaborazione GPU quando il computer è in uso"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr "Spunta questa voce per sospendere l'elaborazione GPU quando stai usando il computer."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr "Questo determina quando il computer è considerato 'in uso'."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "'In uso' significa attività di mouse e tastiera"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "minuti"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "Sospendi quando il lavoro CPU non-%s è superiore a"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Sospendi quando l'utilizzo CPU da parte di applicazioni non-BOINC è superiore a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "Sospendi l'elaborazione quando il tuo computer è impegnato nell'esecuzione di altri applicativi."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr "Altro"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "Mantieni elaborazioni sufficienti per tenere il computer occupato per questo periodo."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr "Memorizza almeno"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr "giorni di lavoro"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:384
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
 msgstr "Archivia elaborazioni addizionali sopra la soglia minima. Determina quanto lavoro è richiesto quando si contatta un progetto."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
 msgstr "Memorizza fino ad ulteriori"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "Se elabori per diversi progetti, %s potrebbe fare lo switch tra i progetti in base a questo tempo."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr "Cambia applicazione ogni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:427
 msgid ""
 "This controls how often tasks save their state to disk, so that they can be "
 "restarted later."
 msgstr "Questo controlla ogni quanto le elaborazioni devono salvare il loro stato su disco, cosicché possano essere riavviate successivamente."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
 msgstr "Richiedi alle elaborazioni dei checkpoint al massimo ogni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr "secondi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr "Limita la velocità di download per i trasferimenti dei file."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr "Limita la velocità di download a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr "KB/secondo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
 msgstr "Limita la velocità di upload per i trasferimenti dei file."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr "Limita la velocità di upload a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr "Esempio: %s può trasferire al massimo 2000 MB di dati ogni 30 giorni."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "Limit usage to"
 msgstr "Limita l'utilizzo a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr "MB ogni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr "giorni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, c-format
 msgid ""
 "Check this only if your Internet provider modifies image files. Skipping "
 "verification reduces the security of %s."
 msgstr "Spunta questa voce solo se il tuo provider Internet modifica i file immagine. Saltare la verifica riduce la sicurezza di %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Skip data verification for image files"
 msgstr "Salta la verifica dati per i file immagine"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
 msgstr "Conferma prima di connettersi ad Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr "Utile solo se hai una connessione via modem, ISDN oppure VPN"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
 msgstr "Disconnetti al termine delle operazioni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "Disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%s utilizzerà le più restrittive di queste impostazioni:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, c-format
 msgid "Limit the total amount of disk space used by %s."
 msgstr "Limita lo spazio disco totale utilizzato da %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:530
-#: clientgui/DlgAdvPreferencesBase.cpp:554
+#: clientgui/DlgAdvPreferencesBase.cpp:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr "Usa non più di"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, c-format
 msgid ""
 "Limit disk usage to leave this much free space on the volume where %s stores"
 " data."
 msgstr "Limita l'utilizzo disco per lasciare questo spazio libero nel luogo dove %s salva i dati."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:542
+#: clientgui/DlgAdvPreferencesBase.cpp:593
 msgid "Leave at least"
 msgstr "Lascia come minimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr "GB liberi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, c-format
 msgid ""
 "Limit the percentage of disk space used by %s on the volume where it stores "
 "data."
 msgstr "Limita la percentuale di utilizzo disco utilizzato da %s nel  luogo dove salva i dati."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: clientgui/DlgAdvPreferencesBase.cpp:610
 #, no-c-format
 msgid "% of total"
 msgstr "% di spazio totale su disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr "Memoria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "Limita la memoria utilizzata da %s quando stai usando il computer."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 msgid "When computer is in use, use at most"
 msgstr "Quando il computer è in uso, usa al massimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:579
-#: clientgui/DlgAdvPreferencesBase.cpp:591
-#: clientgui/DlgAdvPreferencesBase.cpp:607
+#: clientgui/DlgAdvPreferencesBase.cpp:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, c-format
 msgid "Limit the memory used by %s when you're not using the computer."
 msgstr "Limita la memoria utilizzata da %s quando non stai utilizzando il computer."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:586
+#: clientgui/DlgAdvPreferencesBase.cpp:637
 msgid "When computer is not in use, use at most"
 msgstr "Quando il computer non è in uso, utilizza al massimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "Lascia le elaborazioni non-GPU in memoria quando sospese"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:647
 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 "Se selezionato, le elaborazioni sospese rimangono in memoria, e riprendono senza lavoro perso. Se deselezionato, le elaborazioni sospese sono rimosse dalla memoria, e la ripresa parte dall'ultimo checkpoint."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:600
+#: clientgui/DlgAdvPreferencesBase.cpp:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "Limita lo spazio di swap (file di paging) utilizzato da %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr "Spazio di swap: utilizza al massimo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr "e le"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr "a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
 msgstr "Elabora solo durante un particolare periodo ogni giorno."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr "Elabora solo tra"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
 msgstr "Sovrascrivi giorno della settimana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr "Sovrascrivi il tempo sopra sui giorni selezionati:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr "Lunedì"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr "Venerdì"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr "Sabato"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr "Domenica"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr "Trasferisci i files solo durante un particolare periodo ogni giorno."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr "Trasferisci files solo tra"
 
@@ -1586,15 +1620,19 @@ msgstr "Chiudi la finestra senza salvare"
 msgid "%s - Event Log"
 msgstr "%s - Log Eventi"
 
-#: 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 "Progetto"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
 msgid "Time"
 msgstr "Ora"
 
-#: clientgui/DlgEventLog.cpp:239
+#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
 msgid "Message"
 msgstr "Messaggio"
 
@@ -1607,6 +1645,7 @@ msgid "Copy &All"
 msgstr "Copi&a Tutto"
 
 #: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Copia tutti i messaggi negli appunti."
 
@@ -1615,6 +1654,7 @@ msgid "Copy &Selected"
 msgstr "Copia &Selezionati"
 
 #: 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 "
@@ -1622,6 +1662,7 @@ msgid ""
 msgstr "Copia i messaggi selezionati negli appunti. Puoi selezionare più messaggi insieme tenendo premuto il tasto Shift o command mentre clicchi sui messaggi."
 
 #: 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 "
@@ -1663,6 +1704,7 @@ msgid "Add an application to this list"
 msgstr "Aggiungi un'applicazione alla lista"
 
 #: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:90
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1690,6 +1732,8 @@ msgstr "chiudi la finestra senza salvare"
 msgid "shows the preferences web page"
 msgstr "mostra la pagina web di aiuto sulle preferenze"
 
+#. 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"
@@ -1761,6 +1805,7 @@ msgstr "Ricorda la scelta e non visualizzare più questo messaggio."
 
 #: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
 #: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Annulla"
 
@@ -1817,10 +1862,12 @@ msgstr " richiesta di nuovo lavoro rinviata di"
 msgid " work fetch deferral interval"
 msgstr " intervallo di rinvio per la richiesta di nuovi lavori"
 
+#. set dialog title
 #: clientgui/DlgItemProperties.cpp:239
 msgid "Properties of project "
 msgstr "Proprietà del progetto "
 
+#. layout controls
 #: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Dati generali"
@@ -1837,7 +1884,7 @@ msgstr "Nome utente"
 msgid "Team name"
 msgstr "Nome del team"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "Allocazione risorse"
 
@@ -1952,11 +1999,11 @@ msgstr "Fattore di correzione del tempo di elaborazione"
 msgid "Properties of task "
 msgstr "Proprietà dell'unità di lavoro "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: clientgui/DlgItemProperties.cpp:357 clientgui/ViewWork.cpp:266
 msgid "Application"
 msgstr "Applicazione"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: clientgui/DlgItemProperties.cpp:358 clientgui/ViewWork.cpp:267
 msgid "Name"
 msgstr "Nome"
 
@@ -2016,7 +2063,8 @@ msgstr "Cartella"
 msgid "Process ID"
 msgstr "ID processo"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
 msgid "Local: "
 msgstr "Locale:"
 
@@ -2089,6 +2137,7 @@ msgid "Address:"
 msgstr "Indirizzo:"
 
 #: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Porta:"
 
@@ -2101,11 +2150,13 @@ msgid "Leave these blank if not needed"
 msgstr "Lascia questi spazi vuoti se non necessari"
 
 #: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Nome utente:"
 
 #: 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 "Password:"
 
@@ -2300,6 +2351,7 @@ msgid "The home page of the GEO-600 project"
 msgstr "Pagina iniziale del progetto GEO-600"
 
 #: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
+#: clientgui/ViewProjects.cpp:247 clientgui/ViewStatistics.cpp:441
 msgid "Team"
 msgstr "Team"
 
@@ -2465,6 +2517,8 @@ msgstr "Progetto sospeso dall'utente"
 msgid "Task suspended by user"
 msgstr "Elaborazione sospesa dall'utente"
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Sospesa -"
@@ -2621,7 +2675,7 @@ msgstr "Per selezionare un progetto, clicca sul nome o digita il suo indirizzo s
 msgid "Categories:"
 msgstr "Categorie:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Progetti:"
 
@@ -2780,528 +2834,230 @@ msgstr "Rilevazione automatica"
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "Interfaccia"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Condizioni d'uso"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "Seleziona la grafica dell'interfaccia utente."
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Leggi le condizioni d'uso che seguono:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "Visualizza i messaggi di diagnostica del client."
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Accetto le condizioni d'uso."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Visualizzazione Avanzata...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Non accetto le condizioni d'uso."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "Visualizza l'interfaccia grafica avanzata di BOINC"
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Progetto temporaneamente non disponibile"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "Configura le opzioni dell'interfaccia grafica e del proxy"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Il Progetto è temporaneamente non disponibile.\n\nSi prega di riprovare più tardi."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Account manager temporaneamente non disponibile"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "Predefinito"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "L'account manager non è temporaneamente disponibile.\n\nSi prega di riprovare più tardi."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "Sospendi"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Inserire la chiave di accesso per proseguire."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "Sospendi Lavoro"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Chiave di accesso non valida; inserire una chiave di accesso valida"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "Riprendi Lavoro"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Conflitto di validazione"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "Avvisi"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Specificare un indirizzo email"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Apri una finestra per visualizzare gli avvisi dai progetti o dal BOINC"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Indirizzo email non valido; inserire un indirizzo email valido"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "Ottieni aiuto con %s"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "URL mancante"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Scaricamento notizie; attendere prego..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Specificare un URL.\nPer esempio:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Non ci sono avvisi al momento"
+#: 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 "URL non valido"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Chiudi"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Specificare un URL valido.\nPer esempio:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "Avvisi di %s"
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' non contiene un nome di computer valido."
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Per impostazioni aggiuntive, seleziona Preferenze di elaborazione nella Vista Avanzata."
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' non contiene un percorso valido."
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "GB di spazio su disco"
+#. 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 "Comandi"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Preferenze di Elaborazione"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Copia tutti i messaggi"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "Scartare tutte le preferenze locali e utilizzare le preferenze web?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Copia i messaggi selezionati"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Mostra solo questo progetto"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Mostra solamente i messaggi del progetto selezionato."
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Messaggi"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Copia di tutti i messaggi negli appunti in corso..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Copia di tutti i messaggi selezionati negli appunti in corso..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtraggio dei messaggi in corso..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Mostra tutti i messaggi"
+
+#: clientgui/ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Mostra i messaggi di tutti i progetti."
+
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Scaricamento notizie; attendere prego..."
+
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Non ci sono avvisi al momento"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
+msgid "Notices"
+msgstr "Avvisi"
+
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
 msgstr "Aggiorna"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
+#: 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 "Riporta il lavoro completato, aggiorna il totale dei crediti e le preferenze, e possibilmente ottiene altro lavoro."
 
+#: 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 "Sospendi"
+
+#: 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 "Sospendi il lavoro per questo progetto."
 
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:821
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
 msgid "No new tasks"
 msgstr "Blocca la richiesta di lavoro"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "Non scaricare nuovo lavoro per questo progetto."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "Reset del progetto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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 "Cancella tutti i file e le elaborazioni associate a questo progetto e scarica nuovo lavoro.  Puoi aggiornare il progetto prima di eseguire il reset per riportare le elaborazioni già completate."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
+#: 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 "Rimuovi questo progetto dal computer.  Il lavoro in corso andrà perso (usa prima 'Aggiorna' per inviare il lavoro già completato)."
 
+#: clientgui/ViewProjects.cpp:231 clientgui/ViewWork.cpp:246
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
 msgid "Properties"
 msgstr "Proprietà"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr "Visualizza i dettagli del progetto."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr "Riprendi il lavoro per questo progetto."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "Abilita richiesta lavoro"
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "Account"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "Permetti a questo progetto di richiedere nuovo lavoro."
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+msgstr "Crediti totali"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-msgid "Don't fetch new tasks for this project."
-msgstr "Non richiedere nuovo lavoro per questo progetto."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Vuoi davvero fare il reset del progetto '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-msgid "Reset Project"
-msgstr "Reset del progetto"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Vuoi davvero rimuovere il progetto '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-msgid "Remove Project"
-msgstr "Disconnettiti dal progetto"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Aggiungi un progetto"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Sincronizza"
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Lavoro svolto per questo progetto"
-
-#: clientgui/sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Diventa un volontario di uno o di tutti gli oltre 30 progetti nelle varie aree scientifiche"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Sincronizza i progetti con il sistema dell'account manager"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Seleziona un progetto a cui accedere mediantei i controlli sottostanti..."
-
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Siti web del progetto"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Comandi del Progetto"
-
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Apri una finestra con i siti web per il progetto %s"
-
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Apri una finestra di menù dei comandi da applicare al progetto %s"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Mostra la grafica"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Mostra la grafica dell'applicazione in una finestra."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Sospendi questo lavoro."
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Annulla"
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Abbandona questo lavoro. Non otterrai crediti per esso."
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Visualizza i dettagli dell'elaborazione."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Riprendi l'elaborazione selezionata."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Sospendi l'elaborazione selezionata."
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr "Sei sicuro di voler annullare l'elaborazione di '%s'?\n(Avanzamento: %.1lf%%, Stato: %s)"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Annulla l'elaborazione"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Non sei connesso ad alcun progetto.  Prima connettiti ad un progetto."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Non disponibile"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Elaborazioni:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Seleziona un'attività alla quale acccedere"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Da:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Avanzamento di questa attività"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Comandi dell'attività"
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Apri una finestra di menù dei comandi da applicare a questo lavoro"
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Applicazione: %s"
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Applicazione: Non disponibile"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Non disponibile"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Trascorso: %s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Tempo mancante: %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Stato: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1228
-msgid "Retrieving current status."
-msgstr "Ricezione dello stato corrente in corso."
-
-#: clientgui/sg_TaskPanel.cpp:1234
-msgid "Downloading work from the server."
-msgstr "Scaricamento del lavoro dal server in corso."
-
-#: clientgui/sg_TaskPanel.cpp:1239
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Elaborazione sospesa:  alimentazione a batterie."
-
-#: clientgui/sg_TaskPanel.cpp:1241
-msgid "Processing Suspended:  User Active."
-msgstr "Elaborazione sospesa:  l'utente è attivo."
-
-#: clientgui/sg_TaskPanel.cpp:1243
-msgid "Processing Suspended:  User paused processing."
-msgstr "Elaborazione sospesa:  l'utente ha sospeso l'elaborazione."
-
-#: clientgui/sg_TaskPanel.cpp:1245
-msgid "Processing Suspended:  Time of Day."
-msgstr "Elaborazione sospesa:  superati i limiti di orario."
-
-#: clientgui/sg_TaskPanel.cpp:1247
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Elaborazione sospesa:  esecuzione dei benchmark."
-
-#: clientgui/sg_TaskPanel.cpp:1249
-msgid "Processing Suspended."
-msgstr "Elaborazione sospesa."
-
-#: clientgui/sg_TaskPanel.cpp:1253
-msgid "Waiting to contact project servers."
-msgstr "In attesa di contattare i server dei progetti."
-
-#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
-msgid "Retrieving current status"
-msgstr "Ricezione dello stato corrente in corso"
-
-#: clientgui/sg_TaskPanel.cpp:1261
-msgid "No work available to process"
-msgstr "Nessun lavoro disponibile da elaborare"
-
-#: clientgui/sg_TaskPanel.cpp:1263
-msgid "Unable to connect to the core client"
-msgstr "Impossibile connettersi al client BOINC"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Condizioni d'uso"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Leggi le condizioni d'uso che seguono:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Accetto le condizioni d'uso."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Non accetto le condizioni d'uso."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Progetto temporaneamente non disponibile"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "Il Progetto è temporaneamente non disponibile.\n\nSi prega di riprovare più tardi."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Account manager temporaneamente non disponibile"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "L'account manager non è temporaneamente disponibile.\n\nSi prega di riprovare più tardi."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Inserire la chiave di accesso per proseguire."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Chiave di accesso non valida; inserire una chiave di accesso valida"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Conflitto di validazione"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Specificare un indirizzo email"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Indirizzo email non valido; inserire un indirizzo email valido"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "URL mancante"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "Specificare un URL.\nPer esempio:\nhttp://www.example.com/"
-
-#: 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 "URL non valido"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "Specificare un URL valido.\nPer esempio:\nhttp://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' non contiene un nome di computer valido."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' non contiene un percorso valido."
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "Comandi"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Copia tutti i messaggi"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Copia i messaggi selezionati"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Mostra solo questo progetto"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Mostra solamente i messaggi del progetto selezionato."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Messaggi"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Copia di tutti i messaggi negli appunti in corso..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Copia di tutti i messaggi selezionati negli appunti in corso..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtraggio dei messaggi in corso..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Mostra tutti i messaggi"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Mostra i messaggi di tutti i progetti."
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "Account"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "Crediti totali"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "Media dei crediti"
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
+msgstr "Media dei crediti"
 
 #: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
@@ -3336,14 +3092,48 @@ msgstr "Comunicazione con il progetto per non ottenere ulteriore lavoro in corso
 msgid "Resetting project..."
 msgstr "Reset del progetto in corso..."
 
+#: clientgui/ViewProjects.cpp:518 clientgui/sg_ProjectCommandPopup.cpp:229
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "Vuoi davvero fare il reset del progetto '%s'?"
+
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:235
+msgid "Reset Project"
+msgstr "Reset del progetto"
+
 #: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "Rimozione del progetto in corso..."
 
+#: clientgui/ViewProjects.cpp:576 clientgui/sg_ProjectCommandPopup.cpp:266
+#, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "Vuoi davvero rimuovere il progetto '%s'?"
+
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:272
+msgid "Remove Project"
+msgstr "Disconnettiti dal progetto"
+
 #: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Avvio del browser in corso..."
 
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
+msgstr "Riprendi il lavoro per questo progetto."
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
+msgstr "Abilita richiesta lavoro"
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
+msgstr "Permetti a questo progetto di richiedere nuovo lavoro."
+
+#: clientgui/ViewProjects.cpp:821 clientgui/sg_ProjectCommandPopup.cpp:137
+msgid "Don't fetch new tasks for this project."
+msgstr "Non richiedere nuovo lavoro per questo progetto."
+
 #: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Richiesto dall'utente"
@@ -3627,195 +3417,444 @@ msgstr ".\nPuoi attivarlo utlizzando il menù Attività"
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "Tentativo di trasferimento in corso..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "Tentativo di trasferimento in corso..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "Interruzione del trasferimento in corso..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "Sei sicuro di voler annullare il trasferimento di '%s'?\nNOTA: Annullando il trasferimento, invaliderai l'elaborazione e\nnon otterrai i relativi crediti."
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "Annulla il trasferimento del file"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "Invio"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "Ricezione"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "Riprova tra "
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "fallito"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "sospeso"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "attivo"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "in attesa"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr "(rinvio causa progetto: "
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "Mostra le elaborazioni in corso"
+
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
+msgid "Show only active tasks."
+msgstr "Mostra solo le elaborazioni in corso."
+
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
+msgid "Show graphics"
+msgstr "Mostra la grafica"
+
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
+msgid "Show application graphics in a window."
+msgstr "Mostra la grafica dell'applicazione in una finestra."
+
+#: clientgui/ViewWork.cpp:225
+msgid "Show VM Console"
+msgstr "Mostra la Console VM"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "Mostra la console VM in una finestra."
+
+#: clientgui/ViewWork.cpp:233
+msgid "Suspend work for this result."
+msgstr "Sospende l'elaborazione selezionata."
+
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
+msgid "Abort"
+msgstr "Annulla"
+
+#: clientgui/ViewWork.cpp:240
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Abbandona l'elaborazione selezionata. In questo modo non otterai crediti."
+
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
+msgid "Show task details."
+msgstr "Visualizza i dettagli dell'elaborazione."
+
+#: clientgui/ViewWork.cpp:264
+msgid "Remaining (estimated)"
+msgstr "Tempo mancante (stimato)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "Scadenza"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "Elaborazioni"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "Avvio dell'elaborazione..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "Sospensione dell'elaborazione..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "Mostra la grafica dell'applicazione..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "Mostra la console VM per il lavoro..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Sei sicuro di voler annullare l'elaborazione di '%s'?\n(Avanzamento: %s, Stato: %s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Sei sicuro di voler annullare queste %d elaborazioni?"
+
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
+msgid "Abort task"
+msgstr "Annulla l'elaborazione"
+
+#: clientgui/ViewWork.cpp:586
+msgid "Aborting task..."
+msgstr "Interruzione del lavoro in corso..."
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "Mostra tutte le elaborazioni"
+
+#: clientgui/ViewWork.cpp:859
+msgid "Show all tasks."
+msgstr "Mostra tutte le elaborazioni."
+
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr "Riprendi l'elaborazione selezionata."
+
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr "Sospendi l'elaborazione selezionata."
+
+#: clientgui/WizardAttach.cpp:571
+msgid "Do you really want to cancel?"
+msgstr "Sei certo di voler annullare?"
+
+#: clientgui/WizardAttach.cpp:572
+msgid "Question"
+msgstr "Domanda"
+
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "Grafico a Torta"
+
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
+msgid "Services"
+msgstr "Servizi"
+
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
+#, c-format
+msgid "Hide %s"
+msgstr "Nascondi %s"
+
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
+msgstr "Nascondi gli altri"
+
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
+msgstr "Mostra tutti"
+
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
+msgstr "Esci da %s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr "Interfaccia"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr "Seleziona la grafica dell'interfaccia utente."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Visualizzazione Avanzata...\tCtrl+Shift+A"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
+msgstr "Visualizza l'interfaccia grafica avanzata di BOINC"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr "Configura le opzioni dell'interfaccia grafica e del proxy"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr "Visualizza i messaggi di diagnostica del client."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
+msgstr "Predefinito"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
+msgstr "Sospendi Lavoro"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
+msgstr "Riprendi Lavoro"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Apri una finestra per visualizzare gli avvisi dai progetti o dal BOINC"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:360
+#, c-format
+msgid "Get help with %s"
+msgstr "Ottieni aiuto con %s"
+
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Chiudi"
+
+#: clientgui/sg_DlgMessages.cpp:394
+#, c-format
+msgid "%s - Notices"
+msgstr "Avvisi di %s"
+
+#: clientgui/sg_DlgPreferences.cpp:206
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Per impostazioni aggiuntive, seleziona Preferenze di elaborazione nella Vista Avanzata."
+
+#: clientgui/sg_DlgPreferences.cpp:340
+msgid "GB of disk space"
+msgstr "GB di spazio su disco"
+
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - Preferenze di Elaborazione"
+
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "Scartare tutte le preferenze locali e utilizzare le preferenze web?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Aggiungi un progetto"
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "Interruzione del trasferimento in corso..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Sincronizza"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "Sei sicuro di voler annullare il trasferimento di '%s'?\nNOTA: Annullando il trasferimento, invaliderai l'elaborazione e\nnon otterrai i relativi crediti."
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Lavoro svolto per questo progetto"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "Annulla il trasferimento del file"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "Diventa un volontario di uno o di tutti gli oltre 30 progetti nelle varie aree scientifiche"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "Invio"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Sincronizza i progetti con il sistema dell'account manager"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-msgstr "Ricezione"
+#. 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 "Seleziona un progetto a cui accedere mediantei i controlli sottostanti..."
 
-#: clientgui/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "Riprova tra "
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Siti web del progetto"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "fallito"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Comandi del Progetto"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "sospeso"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Apri una finestra con i siti web per il progetto %s"
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
-msgstr "attivo"
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Apri una finestra di menù dei comandi da applicare al progetto %s"
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "in attesa"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "Sospendi questo lavoro."
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr "(rinvio causa progetto: "
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Abbandona questo lavoro. Non otterrai crediti per esso."
 
-#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-msgstr "Mostra le elaborazioni in corso"
+#: clientgui/sg_TaskCommandPopup.cpp:267
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Sei sicuro di voler annullare l'elaborazione di '%s'?\n(Avanzamento: %.1lf%%, Stato: %s)"
 
-#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "Mostra solo le elaborazioni in corso."
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Non sei connesso ad alcun progetto.  Prima connettiti ad un progetto."
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "Mostra la Console VM"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "Non disponibile"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "Mostra la console VM in una finestra."
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "Elaborazioni:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-msgstr "Sospende l'elaborazione selezionata."
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
+msgstr "Seleziona un'attività alla quale acccedere"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Abbandona l'elaborazione selezionata. In questo modo non otterai crediti."
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "Da:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "Tempo mancante (stimato)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "Avanzamento di questa attività"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "Scadenza"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "Comandi dell'attività"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "Elaborazioni"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Apri una finestra di menù dei comandi da applicare a questo lavoro"
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "Avvio dell'elaborazione..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "Applicazione: %s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "Sospensione dell'elaborazione..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "Mostra la grafica dell'applicazione..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "Applicazione: Non disponibile"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "Mostra la console VM per il lavoro..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "Non disponibile"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "Sei sicuro di voler annullare l'elaborazione di '%s'?\n(Avanzamento: %s, Stato: %s)"
+msgid "Elapsed: %s"
+msgstr "Trascorso: %s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Sei sicuro di voler annullare queste %d elaborazioni?"
+msgid "Remaining (estimated): %s"
+msgstr "Tempo mancante: %s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "Interruzione del lavoro in corso..."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "Stato: %s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "Mostra tutte le elaborazioni"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "Ricezione dello stato corrente in corso."
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "Mostra tutte le elaborazioni."
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "Scaricamento del lavoro dal server in corso."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Connessione ad un progetto o ad un account manager"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Elaborazione sospesa:  alimentazione a batterie."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Aggiungi un progetto oppure utilizza l'Account Manager di BOINC"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+msgstr "Elaborazione sospesa:  l'utente è attivo."
 
-#: 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 "Se possibile, aggiungi progetti dal\nsito web di %s.\n\nI progetti aggiunti tramite la procedura guidata\nnon saranno mostrati o gestiti da %s."
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "Elaborazione sospesa:  l'utente ha sospeso l'elaborazione."
 
-#: 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 "Ci sono più di 30 progetti basati su BOINC\nper fare ricerca in molte aree della scienza,\ne si può fare volontariato per il maggior numero di essi.\nÈ possibile aggiungere un progetto direttamente,\noppure utilizzare un 'Account Manager per selezionare i progetti."
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "Elaborazione sospesa:  superati i limiti di orario."
 
-#: 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 "Hai scelto di aggiungere un nuovo progetto di calcolo volontario o di cambiare i progetti\nsui quali contribuire.\n\nAlcuni di questi progetti sono fatti girare e gestiti dalla World Community Grid, mentre altri\nsono fatti girare e gestiti da altri istituti di ricerca o organizzazioni. Il software BOINC\npuò dividere il tuo tempo di elaborazione libero su una combinazione qualunque dei progetti.\n\nAlternativamente, se ti sei registrato con un BOINC Account Manager, puoi usare\n [...]
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Elaborazione sospesa:  esecuzione dei benchmark."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Usa un BOINC Account Manager"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "Elaborazione sospesa."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Aggiungi o cambia i tuoi progetti World Community Grid"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "In attesa di contattare i server dei progetti."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Aggiungi progetti gestiti da altri istituti di ricerca o organizzazioni"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "Ricezione dello stato corrente in corso"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "Sei certo di voler annullare?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "Nessun lavoro disponibile da elaborare"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-msgstr "Domanda"
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
+msgstr "Impossibile connettersi al client BOINC"
 
 #: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
@@ -3829,32 +3868,7 @@ msgstr "< &Indietro"
 msgid "&Finish"
 msgstr "&Fine"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Grafico a Torta"
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Servizi"
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Nascondi %s"
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Nascondi gli altri"
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Mostra tutti"
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "Esci da %s"
-
+#. /////////////////////////////////////////////////////////////////////////
 #: clientgui/DlgAdvPreferencesBase.h:45
 msgid "On this day of the week, compute only during these hours."
 msgstr "In questo giorno della settimana, elabora solo durante queste ore."
diff --git a/locale/it_IT/BOINC-Project-Generic.po b/locale/it_IT/BOINC-Project-Generic.po
index 1e9197d..828a543 100644
--- a/locale/it_IT/BOINC-Project-Generic.po
+++ b/locale/it_IT/BOINC-Project-Generic.po
@@ -6,14 +6,14 @@
 # FileID  : $Id$
 # 
 # Translators:
-# Daniele <daniele.nasuti at gmail.com>, 2015
+# Daniele NAsuti <daniele.nasuti at gmail.com>, 2015
 # Gianfranco Costamagna <costamagnagianfranco at yahoo.it>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-03-04 08:56 PST\n"
-"PO-Revision-Date: 2015-03-16 16:30+0000\n"
+"PO-Revision-Date: 2015-04-22 15:02+0000\n"
 "Last-Translator: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/boinc/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/it_IT/BOINC-Setup.mo b/locale/it_IT/BOINC-Setup.mo
index 43ff88c..d79aedf 100644
Binary files a/locale/it_IT/BOINC-Setup.mo and b/locale/it_IT/BOINC-Setup.mo differ
diff --git a/locale/it_IT/BOINC-Setup.po b/locale/it_IT/BOINC-Setup.po
index 92a8834..c0e874f 100644
--- a/locale/it_IT/BOINC-Setup.po
+++ b/locale/it_IT/BOINC-Setup.po
@@ -5,11 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-08 21:34+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"PO-Revision-Date: 2015-04-20 12:34+0000\n"
+"Last-Translator: Rom Walton\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/boinc/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/ja/BOINC-Drupal.po b/locale/ja/BOINC-Drupal.po
new file mode 100644
index 0000000..7964b12
--- /dev/null
+++ b/locale/ja/BOINC-Drupal.po
@@ -0,0 +1,176 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME <EMAIL at ADDRESS>
+# 
+# Translators:
+# Masahiro Tagashira, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"POT-Creation-Date: 2015-04-20 12:14+0000\n"
+"PO-Revision-Date: 2015-04-20 15:55+0000\n"
+"Last-Translator: Masahiro Tagashira\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/boinc/language/ja/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+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 "Enter the password that accompanies your username."
+msgstr "ユーザー名に付随するパスワードを入力してください。"
+
+msgid "Request new password"
+msgstr "新しいパスワードを要求"
+
+msgid ""
+"If you're already running BOINC, select <i>Add\n"
+"      Project</i>."
+msgstr "すでに BOINC を実行しているならば、<i>プロジェクトを追加</i>を選択してください。"
+
+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 マネージャ・ソフトウェア(他の場所で必要な場合)を使用し、その上でコマンドラインバージョンに接続するためにそのアカウントを使用します。"
+
+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 "BOINC の5.0より前のバージョンを実行している場合、このプロジェクトでのアカウントを作成するために、より新しいバージョンにアップグレードしてください。"
+
+msgid ""
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) アカウントに登録したあなたのEメールアドレスを覚えているならば、こちらからEメールを受け取ることができます:"
+
+msgid ""
+"Enter the email address and click OK. You will be sent email instructions "
+"for resetting your password."
+msgstr "そのEメールアドレスを入力し OK を押してください。パスワードをリセットするための手順を書いたEメールがあなたに送信されます。"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Email address"
+msgstr "Eメールアドレス"
+
+msgid "Home"
+msgstr "自宅"
+
+msgid "Login"
+msgstr "ログイン"
+
+msgid "search"
+msgstr "検索"
+
+msgid "Server status"
+msgstr "サーバー側の状態"
+
+msgid "Language"
+msgstr "言語"
+
+msgid "Enter your @s email address."
+msgstr "あなたのEメールアドレスを入力してください。"
+
+msgid "Join now"
+msgstr "今すぐ参加"
+
+msgid "I'm new"
+msgstr "私は新規ユーザーです"
+
+msgid "I'm a BOINC user"
+msgstr "私は BOINC ユーザーです"
+
+msgid "Welcome back!"
+msgstr "おかえりなさい!"
+
+msgid ""
+"Einstein at 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 at Home は LIGO 重力波検出器からのデータを使用して、自転している中性子星(パルサーとも呼ばれます)からの重力波を探すためのスクリーンセーバーを実行するために、あなたのコンピュータのアイドル時間を使用するプログラムです。"
+
+msgid "Learn more"
+msgstr "もっと詳しく知る"
+
+msgid "View account"
+msgstr "アカウントを見る"
+
+msgid "About our screensaver"
+msgstr "私たちのスクリーンセーバーについて"
+
+msgid "Over 500,000 volunteers and counting."
+msgstr "500,000を超えるボランティアがおり、なおも増えています。"
+
+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 "Eメールアドレスもしくはパスワードを変更するなら、現在のパスワードを入力してください。"
+
+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 "プロジェクト横断 ID"
+
+msgid "Save changes"
+msgstr "変更を保存する"
+
+msgid "Cancel"
+msgstr "キャンセル"
+
+msgid "Change password"
+msgstr "パスワードの変更"
+
+msgid "Password"
+msgstr "パスワード:"
diff --git a/locale/ja/BOINC-Manager.mo b/locale/ja/BOINC-Manager.mo
index f0cc349..7f903f9 100644
Binary files a/locale/ja/BOINC-Manager.mo and b/locale/ja/BOINC-Manager.mo differ
diff --git a/locale/ja/BOINC-Manager.po b/locale/ja/BOINC-Manager.po
index b6d0231..ebf9588 100644
--- a/locale/ja/BOINC-Manager.po
+++ b/locale/ja/BOINC-Manager.po
@@ -8,8 +8,8 @@ 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-03-25 15:31+0000\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-01 22:02+0000\n"
 "Last-Translator: Masahiro Tagashira\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/boinc/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja\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
@@ -175,6 +175,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
@@ -203,364 +205,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 を開きます"
+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…"
-msgstr "プレファレンス..."
+#: 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:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "プロジェクトを追加します"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "アカウント・マネージャを使用(&U)…"
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "新しい科学プロジェクトを追加、あるいはアカウント・マネージャを利用"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "このコンピュータの管理にアカウント・マネージャを使用します。"
 
-#: clientgui/AdvancedFrame.cpp:459
+#: 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 を使うのを止める(&T)..."
 
-#: 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 "BOINC によるネットワークアクセスを停止します"
 
-#: 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"
@@ -570,39 +577,39 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr "%s の利用を停止しても、現在参加しているプロジェクトに影響はありませんが、\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)に接続済み"
@@ -650,7 +657,9 @@ msgstr "%s を終了(&X)"
 msgid "%s - Communication"
 msgstr "%s - 通信"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -723,6 +732,7 @@ msgid ""
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr "%s は現在 %s クライアントと繋がっていません。メニューの [高度な操作(D)] から\n[コンピュータの選択...] へ進み、接続する %s クライアントのコンピュータを選びます。\nあなたの操作しているコンピュータ自身に接続するには、「コンピュータ名 (ホスト名)」の欄に localhost と入力してください。"
 
+#. Create the web sites task group
 #: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "プロジェクトのウェブページ"
@@ -807,7 +817,8 @@ msgstr "%s に対する所有権あるいは許可情報が正しく設定され
 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 ")"
 
@@ -817,7 +828,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 マネージャ"
 
@@ -869,6 +880,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 "(言語の自動判別)"
@@ -891,13 +903,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 を休止"
 
@@ -905,52 +917,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 "新しいお知らせがあります - 確認するにはクリックします。"
 
@@ -1009,6 +1024,7 @@ msgstr "%s からの状況更新が完了しました。"
 msgid "Update completed."
 msgstr "更新が完了しました。"
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "これでアカウント・マネージャを使うようになりました"
@@ -1055,48 +1071,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr "BOINC は GNU Lesser General Public License v3.0 の下で配布されています。"
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr "訪問"
+msgid "For more information, visit "
+msgstr "詳細については、以下を訪問してください"
 
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
-msgstr "詳細については。"
-
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "OK(&O)"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr "無効な数字"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 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:771
+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:772
 msgid "Number must be between 0 and 100"
 msgstr "数字は 0 から 100 の間でなければなりません"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "無効な入力値が検出されました"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 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:1171
 msgid "Confirmation"
 msgstr "確認"
 
@@ -1105,106 +1121,111 @@ 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[ウェブのプレファレンスを使用する]をクリックすると下記のウェブ上のプレファレンスを使用します:"
 
-#: 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 "代わりにローカル・プレファレンスを使用する場合、値を設定しOKをクリックします。"
 
-#: 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設定するにはOKをクリックしてください。\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:215
 msgid "Use web prefs"
 msgstr "ウェブのプレファレンスを使用する"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 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:688
 msgid "Computing"
 msgstr "計算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 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:347
 msgid "OK"
 msgstr "OK"
 
-#: 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:357
 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:471
 msgid "Usage limits"
 msgstr "使用量の制限"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, 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:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr "最大で"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% の CPUコアまで"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1212,342 +1233,355 @@ msgid ""
 "and repeat."
 msgstr "CPU温度とエネルギー使用量を抑制するために数秒ごとに計算を一時停止/再開する。例: 75%であれば、3秒計算・1秒一時停止を繰り返すということです。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% の CPU 時間まで"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr "いつ一時停止するか"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr "コンピュータがバッテリーで稼働している時一時停止"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "携帯用機器でバッテリー電源で動作している時計算を一時停止するには、ここにチェックを入れてください。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr "コンピュータを使用中は、計算を一時停止"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "あなたがコンピュータを使用している時計算とファイル転送を一時停止するには、ここにチェックを入れます。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
 msgstr "コンピュータを使用中は、GPU による計算を一時停止"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 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:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr "ここではコンピュータがどんな場合に「使用中」とみなすか決定します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "「使用中」とは、マウス・キーボード入力が右の時間内にあった場合のことです:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "分"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "超えることで一時停止する場合の %s 以外のCPU使用量:"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "超えることで一時停止する場合の BOINC 以外のCPU使用量:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "コンピュータが他のプログラムによってビジー状態にある時、計算を一時停止します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr "その他"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "長期間コンピュータのビジー状態を保つために、最低に見積もっても十分なタスクを蓄えておきます。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr "最低限の備蓄量:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr "日分の仕事"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:384
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
 msgstr "最小レベル以上の追加タスクを備蓄してください。プロジェクトに連絡する際に要求される作業の量を決定します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
 msgstr "追加で下記の分まで備蓄:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "いくつかのプロジェクトを動作させる場合、%s はこの間隔でそれらプロジェクトを切り替えるでしょう"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr "タスクの切り替え間隔"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:427
 msgid ""
 "This controls how often tasks save their state to disk, so that they can be "
 "restarted later."
 msgstr "ここではタスクが後ほど再起動されることが出来るようにするために、ディスクにその状態を保存する間隔を設定します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
 msgstr "タスクにチェックポイント書き込みを要求する最大間隔"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr "秒毎"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr "ファイル転送のダウンロード速度を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr "ダウンロード速度を下記に制限"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr "KB/秒"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
 msgstr "ファイル転送のアップロード速度を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr "アップロード速度を下記に制限"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr "例: %s は多くとも30日ごとに2000MBのデータまで転送するはずです。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "Limit usage to"
 msgstr "使用限度量"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr "MB/"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr "日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, c-format
 msgid ""
 "Check this only if your Internet provider modifies image files. Skipping "
 "verification reduces the security of %s."
 msgstr "インターネットプロバイダが画像ファイルを変更する場合はチェックを入れてください。検証をスキップすると %s のセキュリティレベルは低下します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Skip data verification for image files"
 msgstr "画像ファイルのデータ検証をスキップする"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
 msgstr "インターネットに接続する前に確認する"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr "モデム、ISDN または VPN 接続を使っているときのみ便利です。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
 msgstr "終わったら切断"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "ディスク"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%sは、これら3つの設定のうち最も制限的なものを使用します:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, 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:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr "使用上限:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, 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:593
 msgid "Leave at least"
 msgstr "最低限の空き領域"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr "GB の空き領域"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, 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:610
 #, no-c-format
 msgid "% of total"
 msgstr "% まで(全体比)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr "メモリ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "あなたがコンピュータを使用している時 %s よって使用されるメモリを制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 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:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, 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:637
 msgid "When computer is not in use, use at most"
 msgstr "コンピュータが使用されていない時、最大使用時でも"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "一時停止中に、GPU向けでないタスクをメモリ上に残す"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:647
 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:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "%s によって使用されるスワップ領域(ページファイル)を制限します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr "ページ/スワップファイル: 最大使用時でも"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr "~"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr "へ"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
 msgstr "それぞれの日の特定範囲の時間帯だけ計算します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr "下記の間だけ計算:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
 msgstr "曜日ごとの設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr "選択した日には上記の時間を設定解除します:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr "月曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr "金曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr "土曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr "日曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr "木曜日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr "それぞれの日の特定範囲の時間帯だけファイルを転送します。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr "下記の間だけファイルを転送"
 
@@ -1586,15 +1620,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 "メッセージ"
 
@@ -1607,6 +1645,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 "全メッセージをクリップボードにコピーします"
 
@@ -1615,6 +1654,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 "
@@ -1622,6 +1662,7 @@ msgid ""
 msgstr "選択したメッセージをクリップボードにコピーします。シフトまたはコマンドキーを押しながらクリックすることで複数のメッセージを選択できます。"
 
 #: 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 "
@@ -1663,6 +1704,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 "削除"
 
@@ -1690,6 +1732,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"
@@ -1761,6 +1805,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)"
 
@@ -1817,10 +1862,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 "一般"
@@ -1837,7 +1884,7 @@ msgstr "参加者名(ユーザー名)"
 msgid "Team name"
 msgstr "チームの名称"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "リソース割り当て"
 
@@ -1952,11 +1999,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 "名前"
 
@@ -2016,7 +2063,8 @@ msgstr "ディレクトリ"
 msgid "Process ID"
 msgstr "プロセスID"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
 msgid "Local: "
 msgstr "ローカル:"
 
@@ -2089,6 +2137,7 @@ msgid "Address:"
 msgstr "アドレス:"
 
 #: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "ポート番号:"
 
@@ -2101,11 +2150,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 "パスワード:"
 
@@ -2300,6 +2351,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 "チーム"
 
@@ -2465,6 +2517,8 @@ msgstr "参加者によってプロジェクト一時停止"
 msgid "Task suspended by user"
 msgstr "参加者によってタスク一時停止"
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "一時停止中 - "
@@ -2621,7 +2675,7 @@ msgstr "プロジェクトを選択するには、その名前をクリックす
 msgid "Categories:"
 msgstr "種類:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "プロジェクト:"
 
@@ -2780,528 +2834,230 @@ msgstr "自動検出"
 msgid "SOCKS proxy"
 msgstr "SOCKS プロキシ"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "スキン"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "利用規約"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "ユーザーインターフェースの外観を選択します。"
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "以下の利用規約をお読みください:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "診断メッセージを表示します"
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "利用規約に合意する。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "詳細表示... \tCTRL+SHIFT+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "利用規約に合意しない。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "詳細版のグラフィカルインタフェースを表示します。"
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "プロジェクトは一時的に利用できません"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "表示オプションとプロキシ設定を構成します"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "プロジェクトは一時的に利用できません。\n\n少し待ってからもう一度試してください。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "アカウント・マネージャは一時的に利用できません"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "初期値(指定省略時の扱い)"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "アカウント・マネージャは一時的に利用できません。\n\n少し待ってからもう一度試してください。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "一時停止"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "続けるにはアカウント・キーを入力してください。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "計算を一時停止"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "無効なアカウント・キーです。正しいアカウント・キーを入力してください"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "計算を再開"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "検証のコンフリクト"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "お知らせ"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Eメールアドレスを指定してください"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "プロジェクトまたは BOINC からのお知らせを見るためウィンドウを開く"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "無効な電子メールアドレスです。正しい電子メールアドレスを入力してください"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "%s について助けを求める"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "URL の指定が足りません"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "お知らせを取得中、お待ち下さい…"
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "URL を指定してください。\n例:\n\t http://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-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
+msgid "Invalid URL"
+msgstr "無効なURL"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "閉じる"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "正しい URL を指定してください。\n例:\n\t http://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "%s からのお知らせ"
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' には有効なホスト名が含まれていません。"
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "追加設定は、詳細表示から計算に関するプレファレンスを選択してください。"
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' には有効なパスが含まれていません。 "
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "GB のディスク領域"
+#. 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 "操作"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - 計算に関するプレファレンス"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "全メッセージをコピー"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "すべてのローカル・プレファレンスを放棄してウェブ上のプレファレンスを使用しますか?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "選択したメッセージをコピー"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "このプロジェクトだけを表示"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "選択したプロジェクトのメッセージだけを表示"
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "メッセージ"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "全メッセージをクリップボードにコピーしています..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "選択したメッセージをクリップボードにコピーしています..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "メッセージをフィルターにかけています..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "全メッセージを表示"
+
+#: clientgui/ViewMessages.cpp:495
+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/sg_ProjectCommandPopup.cpp:66
+#: 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/sg_ProjectCommandPopup.cpp:67
+#: 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 "完了した全タスクを報告し、最新の功績 (credit) とプレファレンス (好みの設定) を取得し、可能であれば更にタスクを取得します。"
 
+#: 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/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "このプロジェクトのタスクを新たに取得しないようにします。"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "プロジェクトをリセット"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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/sg_ProjectCommandPopup.cpp:91
+#: 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/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 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/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "アカウント"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "このプロジェクトについて新しいタスクの取得を許可します。"
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+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 "科学の多分野に渡る30以上のプロジェクトにどれにでもいくつでも、ボランティアで参加しましょう。"
-
-#: 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 "下にあるコントロールでアクセスするプロジェクトを1つ選択"
-
-#: 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 "利用規約"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "以下の利用規約をお読みください:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "利用規約に合意する。"
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "利用規約に合意しない。"
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "プロジェクトは一時的に利用できません"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "プロジェクトは一時的に利用できません。\n\n少し待ってからもう一度試してください。"
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "アカウント・マネージャは一時的に利用できません"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "アカウント・マネージャは一時的に利用できません。\n\n少し待ってからもう一度試してください。"
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "続けるにはアカウント・キーを入力してください。"
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "無効なアカウント・キーです。正しいアカウント・キーを入力してください"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "検証のコンフリクト"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Eメールアドレスを指定してください"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "無効な電子メールアドレスです。正しい電子メールアドレスを入力してください"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "URL の指定が足りません"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "URL を指定してください。\n例:\n\t http://www.example.com/"
-
-#: 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 "無効なURL"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "正しい URL を指定してください。\n例:\n\t http://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' には有効なホスト名が含まれていません。"
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' には有効なパスが含まれていません。 "
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "操作"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "全メッセージをコピー"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "選択したメッセージをコピー"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "このプロジェクトだけを表示"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "選択したプロジェクトのメッセージだけを表示"
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "メッセージ"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "全メッセージをクリップボードにコピーしています..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "選択したメッセージをクリップボードにコピーしています..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "メッセージをフィルターにかけています..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "全メッセージを表示"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "すべてのプロジェクトのメッセージを表示"
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "アカウント"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "終了した仕事量"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "終了した仕事量の平均"
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
+msgstr "終了した仕事量の平均"
 
 #: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
@@ -3336,14 +3092,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 "参加者の指示による"
@@ -3627,195 +3417,444 @@ msgstr ".\n再開させるには、アクティビティのメニューから操
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "現在、転送を再試行しています..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "現在、転送を再試行しています..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "ファイル転送を中止しています..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "本当にこのファイル転送 '%s' を中止してよろしいですか?\n注意: 転送を中止するとタスクは無効となり功績値は付与されなくなります。"
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "ファイル転送を中止"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "アップロード"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "ダウンロード"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "右記の時間内に再試行:"
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "失敗"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "一時停止中"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "活動中"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "保留中"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr " (プロジェクトとの通信待機: "
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "活動中のタスクを表示する"
+
+#: 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 "VMのコンソールを表示"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "ウィンドウを開いてVMのコンソールを表示します。"
+
+#: clientgui/ViewWork.cpp:233
+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 "残り時間(推定)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "報告期限"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "タスク"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "タスクを再開しています..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "タスクを一時停止しています..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "タスクについてのグラフィックを表示しています..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "タスクについてのVMのコンソールを表示しています..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "本当にこのタスク '%s' を中止してよろしいですか?\n(進捗状況: %s, 状態: %s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+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 "タスクを中止しています…"
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "全てのタスクを表示"
+
+#: clientgui/ViewWork.cpp:859
+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:571
+msgid "Do you really want to cancel?"
+msgstr "本当にキャンセルしますか?"
+
+#: clientgui/WizardAttach.cpp:572
+msgid "Question"
+msgstr "質問"
+
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "Ctrlのパイ"
+
+#: 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:360
+#, 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:340
+msgid "GB of disk space"
+msgstr "GB のディスク領域"
+
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - 計算に関するプレファレンス"
+
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "すべてのローカル・プレファレンスを放棄してウェブ上のプレファレンスを使用しますか?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "プロジェクトを追加"
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "ファイル転送を中止しています..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "同期"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "本当にこのファイル転送 '%s' を中止してよろしいですか?\n注意: 転送を中止するとタスクは無効となり功績値は付与されなくなります。"
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "このプロジェクトの仕事が完了"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "ファイル転送を中止"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "科学の多分野に渡る30以上のプロジェクトにどれにでもいくつでも、ボランティアで参加しましょう。"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "アップロード"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "アカウント・マネージャ・システムとプロジェクトを同期"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-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 "下にあるコントロールでアクセスするプロジェクトを1つ選択"
 
-#: clientgui/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "右記の時間内に再試行:"
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "プロジェクトのウェブサイト"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "失敗"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "プロジェクトに関する操作"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "一時停止中"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "プロジェクト %s のポップアップ・メニューを開く"
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
-msgstr "活動中"
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "プロジェクト %s に対する操作のポップアップ・メニューを開く"
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "保留中"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "このタスクを一時停止します。"
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr " (プロジェクトとの通信待機: "
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "このタスクを放棄します。これについて功績値)を受け取ることはできません。"
 
-#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-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/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "活動中のタスクだけを表示します。"
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "どこのプロジェクトにも参加していません。プロジェクトを追加してください。"
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "VMのコンソールを表示"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "表示できる情報がありません"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "ウィンドウを開いてVMのコンソールを表示します。"
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "タスク:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-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/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "このリザルトの仕事を放棄します。このリザルトについて功績値を受け取ることはできません。"
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "送信元:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "残り時間(推定)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "このタスクの進捗状況"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "報告期限"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "タスクへの操作"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "タスク"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "このタスクに対する操作のポップアップメニューを開く"
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "タスクを再開しています..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "アプリケーション: %s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "タスクを一時停止しています..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "タスクについてのグラフィックを表示しています..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "アプリケーション: 表示できる情報がありません"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "タスクについてのVMのコンソールを表示しています..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "表示できる情報がありません"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "本当にこのタスク '%s' を中止してよろしいですか?\n(進捗状況: %s, 状態: %s)"
+msgid "Elapsed: %s"
+msgstr "経過時間: %s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "本当にこれら %d 個のタスクを中止しますか?"
+msgid "Remaining (estimated): %s"
+msgstr "残り時間(推定): %s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "タスクを中止しています…"
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "状態: %s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "全てのタスクを表示"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "現在の状態を読み出しています。"
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "全てのタスクを表示します。"
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "仕事をサーバからダウンロードしています。"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "プロジェクトあるいはアカウント・マネージャを追加"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "処理を一時停止: バッテリーで稼働中"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "プロジェクトを追加あるいはアカウント・マネージャを利用"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+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\nこのウィザード経由でプロジェクトを追加すると\n%s 上で表示・管理できません。"
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "処理を一時停止: 参加者の指示による一時停止"
 
-#: 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 "BOINC を使っているプロジェクトは30以上あり、科学の多く\nの領域で研究をしています。どの研究にも好きなだけボラン\nティアとして参加できます。プロジェクトを参加範囲に入れ\nるには、直接プロジェクトを追加するか、アカウント・マネージャ\nのウェブサイトでまとめて選んで追加します。"
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "処理を一時停止: 動作制限時間帯"
 
-#: 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 によって実行・管理され、同時に他の研究者や組織によって実行・管理されます。BOINC ソフトウェアはプロジェクトの任意の組み合わせの中からあなたの予備の処理能力を振り分けることができます。\n\nあるいは、あなたが BOINC アカウント・マネージャ に登録している場合、支援するプロジェクトの選択のために利用することができます。\n\n変更したいタイプを選択してください:\n"
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "処理を一時停止: ベンチマーク走行中"
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "BOINC アカウント・マネージャを使用する"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "処理は一時停止されました。"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "World Community Grid のプロジェクトを追加あるいは変更"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "プロジェクトのサーバに接続待機しています。"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "他の研究者あるいは組織が運営するプロジェクトを追加"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "現在の状態を読み出し中"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "本当にキャンセルしますか?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "処理する仕事がありません"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-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 >"
@@ -3829,32 +3868,7 @@ msgstr "< 戻る(&B)"
 msgid "&Finish"
 msgstr "終了(&F)"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Ctrlのパイ"
-
-#: 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/locale/ja/BOINC-Project-Generic.po b/locale/ja/BOINC-Project-Generic.po
index eb03b68..ec81c2c 100644
--- a/locale/ja/BOINC-Project-Generic.po
+++ b/locale/ja/BOINC-Project-Generic.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-03-04 08:56 PST\n"
-"PO-Revision-Date: 2015-03-08 05:08+0000\n"
+"PO-Revision-Date: 2015-05-01 21:33+0000\n"
 "Last-Translator: Masahiro Tagashira\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/boinc/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -998,7 +998,7 @@ msgstr "宛先"
 
 #: ../inc/pm.inc:82
 msgid "User IDs or unique usernames, separated with commas"
-msgstr "参加者のIDあるいは、一意な名前を入力します。複数の場合はカンマで区切ってください。"
+msgstr "ユーザーIDあるいは、一意の名前を入力します。複数の場合はカンマで区切ってください。"
 
 #: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:144
 msgid "Subject"
@@ -1326,7 +1326,7 @@ msgstr "インターネットに接続する前に確認する"
 
 #: ../inc/prefs.inc:223 ../inc/prefs.inc:229
 msgid "Useful only if you have a modem, ISDN or VPN connection."
-msgstr "モデム、ISDN または VPN 接続を使っているときのみ役立ちます。"
+msgstr "モデム、ISDN または VPN 接続を使っているときのみ便利です。"
 
 #: ../inc/prefs.inc:228
 msgid "Disconnect when done"
@@ -1782,7 +1782,7 @@ msgstr "ワークユニットが取り消されました"
 
 #: ../inc/result.inc:322
 msgid "Canonical result is missing"
-msgstr "標準的結果が見つかりません"
+msgstr "基準となる結果が見つかりません"
 
 #: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
@@ -1923,7 +1923,7 @@ msgstr "キーワード"
 
 #: ../inc/team.inc:41
 msgid "Find teams with these words in their names or descriptions"
-msgstr "指定する語句がその名称または説明に含まれているチームを探します"
+msgstr "指定する語句がその名称または説明文に含まれているチームを探します"
 
 #: ../inc/team.inc:49 ../inc/team.inc:468
 msgid "Type of team"
@@ -1972,7 +1972,7 @@ msgstr "チームの情報"
 
 #: ../inc/team.inc:89 ../user/team_forum.php:72 ../user/team_search.php:82
 msgid "Description"
-msgstr "説明"
+msgstr "説明文"
 
 #: ../inc/team.inc:101
 msgid "Web site"
@@ -2126,7 +2126,7 @@ msgstr "このURLへは、このサイト内のチームのページからリン
 
 #: ../inc/team.inc:461
 msgid "Description of team"
-msgstr "チームの説明"
+msgstr "チームの説明文"
 
 #: ../inc/team.inc:477
 msgid "Accept new members?"
@@ -2238,7 +2238,7 @@ msgstr "その他のアカウント情報"
 
 #: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
-msgstr "参加者のID(ユーザーID)"
+msgstr "ユーザーID"
 
 #: ../inc/user.inc:229
 msgid "Used in community functions"
@@ -2914,11 +2914,11 @@ msgstr "匿名での寄付"
 msgid ""
 "Select this if you dont want your name and account number displayed in\n"
 "donator lists.<br>If not checked, you will be recorded as user ID %1"
-msgstr "寄付者一覧にあなたの名前やアカウント番号を載せたくなければ、\nここを選択してください。<br> チェックを入れなければ、参加者ID %1 であなたの寄付を記録いたします。"
+msgstr "寄付者一覧にあなたの名前やアカウント番号を載せたくなければ、\nここを選択してください。<br> チェックを入れなければ、ユーザーID %1 であなたの寄付を記録いたします。"
 
 #: ../user/donations.php:324
 msgid "To assign the donation with your user ID, please log in."
-msgstr "あなたの参加者IDに寄付を結びつけるには、ログインしてください。"
+msgstr "あなたのユーザーIDに寄付を結びつけるには、ログインしてください。"
 
 #: ../user/donations.php:328
 msgid "Proceed"
@@ -3180,7 +3180,7 @@ msgstr "これらの参加者による掲示板への投稿と非公開メッセ
 
 #: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
-msgstr "参加者の ID (たとえば、123456789)"
+msgstr "ユーザーID (たとえば、123456789)"
 
 #: ../user/edit_forum_preferences_form.php:157 ../user/pm.php:256
 msgid "Add user to filter"
@@ -3503,7 +3503,7 @@ msgstr "投稿禁止の採決"
 
 #: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
-msgstr "この ID の参加者は見つかりません。"
+msgstr "このIDの参加者は見つかりません。"
 
 #: ../user/forum_banishment_vote.php:57 ../user/forum_moderate_post.php:79
 msgid "User is already banished"
@@ -3520,7 +3520,7 @@ msgstr "本当に %1 を投稿禁止にしますか?<br/>参加者 %1 は決
 msgid ""
 "Select the reason category, optionally write a longer description of why the"
 " user should be banished."
-msgstr "理由を分類から選んでください。その参加者がなぜ投稿を禁止されるべきかの説明を書き込むこともできます(任意)。"
+msgstr "理由を分類から選んでください。その参加者がなぜ投稿を禁止されるべきかの説明文を書き込むこともできます(任意)。"
 
 #: ../user/forum_banishment_vote.php:65 ../user/forum_moderate_thread.php:56
 msgid "Category"
@@ -4000,7 +4000,7 @@ msgstr "オプション:"
 
 #: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
-msgstr "参加者ID %1(デフォルト:すべての参加者)からの投稿だけを含める。"
+msgstr "ユーザーID %1(デフォルト:すべての参加者)からの投稿だけを含める。"
 
 #: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
@@ -4655,7 +4655,7 @@ msgstr "使用可能な HTML タグ"
 
 #: ../user/html.php:25
 msgid "The following HTML tags are allowed in team descriptions:"
-msgstr "以下の HTML タグをチームの説明の中で使うことが許可されています:"
+msgstr "以下の HTML タグをチームの説明文の中で使うことが許可されています:"
 
 #: ../user/html.php:27
 msgid "bold"
@@ -5041,7 +5041,7 @@ msgstr "ユーザー名が %1 の参加者は見つかりませんでした"
 
 #: ../user/pm.php:217
 msgid "%1 is not a unique username; you will have to use user ID"
-msgstr "ユーザー名 %1 は複数存在します。IDを指定してください。"
+msgstr "ユーザー名 %1 は複数存在します。ユーザーIDを指定してください。"
 
 #: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
@@ -5255,7 +5255,7 @@ msgstr "アクセス禁止"
 
 #: ../user/results.php:69
 msgid "Missing user ID or host ID"
-msgstr "参加者のIDまたは計算機のIDが指定されていません"
+msgstr "ユーザーIDまたは計算機のIDが指定されていません"
 
 #: ../user/results.php:107
 msgid "No tasks to display"
@@ -5390,7 +5390,7 @@ msgstr "チームメンバーのメールアドレスにアクセス"
 
 #: ../user/team.php:36
 msgid "edit the team's name and description"
-msgstr "チームの名称と説明を編集"
+msgstr "チームの名称と説明文を編集"
 
 #: ../user/team.php:37
 msgid "add or remove team admins"
@@ -5443,7 +5443,7 @@ msgstr "チームのメンバーから「チーム管理者」を複数選べま
 
 #: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
-msgstr "チームの情報(名前、URL、説明、国名)を編集する"
+msgstr "チームの情報(名前、URL、説明文、国名)を編集する"
 
 #: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
@@ -5900,7 +5900,7 @@ msgstr "以下にご注意ください:"
 
 #: ../user/team_join_form.php:37
 msgid "Joining a team gives its founder access to your email address."
-msgstr "チームに参加すると、その創設者にあなたの Eメールアドレスが知らされます。"
+msgstr "チームに参加すると、その創設者はあなたのメールアドレスを知ることになります。"
 
 #: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
@@ -5930,7 +5930,7 @@ msgstr "100件を超える数のチームが見つかりました。最初の100
 msgid ""
 "End of results. %1 If you cannot find the team you are looking for, you may "
 "%2create a team%3 yourself."
-msgstr "検索結果の末尾。%1 探しているチームを見つけることができなかったなら、 ご自身で %2チームを作る%3 こともできます。"
+msgstr "検索結果の最後です。%1 探しているチームを見つけることができなかったなら、ご自身で %2チームを作る%3 こともできます。"
 
 #: ../user/team_manage.php:28
 msgid "Team administration for %1"
@@ -5938,7 +5938,7 @@ msgstr "%1 のチーム管理"
 
 #: ../user/team_manage.php:31
 msgid "Edit team info"
-msgstr "チームの情報を更新する"
+msgstr "チームの情報を編集する"
 
 #: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
@@ -5958,7 +5958,7 @@ msgstr "テキスト"
 
 #: ../user/team_manage.php:37
 msgid "View member names and email addresses"
-msgstr "メンバーの名前と Eメイルアドレスを表示する"
+msgstr "メンバーの名前とEメールアドレスを表示する"
 
 #: ../user/team_manage.php:38
 msgid "View change history:"
@@ -5970,11 +5970,11 @@ msgstr "XML"
 
 #: ../user/team_manage.php:41
 msgid "See when members joined or quit this team"
-msgstr "メンバーのチーム参加と脱退の日時を表示する"
+msgstr "メンバーのチーム参加/脱退日時を表示する"
 
 #: ../user/team_manage.php:52
 msgid "Respond to foundership request."
-msgstr "創設者権限の委譲要求に応答する。"
+msgstr "創設者権限の委譲要求に応答します。"
 
 #: ../user/team_manage.php:52
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
@@ -5982,19 +5982,19 @@ msgstr "%1までに応答しないと、%2 がチーム創設者の地位を引
 
 #: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
-msgstr "チームから活動していないメンバー、好ましくないメンバーを削除する"
+msgstr "活動していない、もしくは好ましくないメンバーをチームから削除する"
 
 #: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
-msgstr "創設者の権限を他のメンバーに委譲する"
+msgstr "創設者権限を他のメンバーに委譲する"
 
 #: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
-msgstr "チーム管理者を追加・削除する"
+msgstr "チーム管理者を追加/削除する"
 
 #: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
-msgstr "選んだメンバーにチーム管理者の権限を与える"
+msgstr "選択したメンバーにチーム管理者の特権を与える"
 
 #: ../user/team_manage.php:63
 msgid "Remove team"
@@ -6006,19 +6006,19 @@ msgstr "チームにメンバーがいないときだけ可能"
 
 #: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
-msgstr "チームの掲示板を作成・管理する"
+msgstr "チームの掲示板を作成/管理する"
 
 #: ../user/team_manage.php:73
 msgid ""
 "To have this team created on all BOINC projects (current and future) you can"
 " make it into a %1BOINC-wide team%2."
-msgstr "このチームをすべての BOINCプロジェクト(現在および未来にわたって)に設置するために、 %1BOINC ワイドのチーム%2 というものにすることも可能です。"
+msgstr "このチームをすべて(現在および未来にわたって)の BOINC プロジェクトに設置するために、%1BOINC ワイドのチーム%2 というものにすることもできます。"
 
 #: ../user/team_manage.php:75
 msgid ""
 "Team admins are encouraged to join and participate in the Google %1boinc-"
 "team-founders%2 group."
-msgstr "チーム管理者には、Googleの %1boinc-team-founders%2 グループに参加して活動することをお奨めします。"
+msgstr "チーム管理者には、Googleの %1boinc-team-founders%2 グループに参加して活動することをおすすめします。"
 
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
@@ -6030,7 +6030,7 @@ msgstr "チーム %1 を削除しました"
 
 #: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
-msgstr "制限値を超過: 最初の1000メンバーのみ表示可能です。"
+msgstr "制限超過: 最初の1000メンバーのみ表示可能です。"
 
 #: ../user/team_members.php:51
 msgid "Members of %1"
@@ -6042,7 +6042,7 @@ msgstr "チームから脱退できません"
 
 #: ../user/team_quit_action.php:35
 msgid "Team doesn't exist, or you don't belong to it."
-msgstr "指定したチームが存在しないか、あなたがそのチームに所属していません。"
+msgstr "指定したチームが存在しないか、あなたはそのチームに所属していません。"
 
 #: ../user/team_quit_form.php:33
 msgid "Quit %1"
@@ -6055,11 +6055,11 @@ msgid ""
 "         <li>If you quit a team, you may rejoin later, or join any other team you desire\n"
 "         <li>Quitting a team does not affect your personal credit statistics in any way.\n"
 "         </ul>"
-msgstr "<strong>チームを脱退する前に注意していただくこと:</strong>\n         <ul>\n         <li>チームを抜けたら、後でそこに戻ることも、お望みの他のチームに参加することもできます\n         <li>チームを脱退しても、決してあなた個人の功績データに影響はありません。\n         </ul>"
+msgstr "<strong>チームを脱退する前に注意していただくこと:</strong>\n<ul>\n<li>チームを抜けたら、後でそこに戻ることも、希望する他のチームに参加することもできます\n<li>チームを脱退しても、決してあなた個人の功績統計には影響しません。\n</ul>"
 
 #: ../user/team_quit_form.php:42
 msgid "Quit Team"
-msgstr "チームから離脱する"
+msgstr "チームを離脱する"
 
 #: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
@@ -6067,7 +6067,7 @@ msgstr "%1 からメンバーを削除しています"
 
 #: ../user/team_remove_inactive_action.php:41
 msgid "%1 is not a member of %2"
-msgstr "%1 は %2のメンバーではありません"
+msgstr "%1 は %2 のメンバーではありません"
 
 #: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
@@ -6075,15 +6075,15 @@ msgstr "%1 は削除されました"
 
 #: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
-msgstr "%1からメンバーを削除する"
+msgstr "%1 からメンバーを削除する"
 
 #: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
-msgstr "削除しますか?"
+msgstr "削除しますか?"
 
 #: ../user/team_remove_inactive_form.php:42
 msgid "Name (ID)"
-msgstr "名前(ID)"
+msgstr "名前 (ID)"
 
 #: ../user/team_remove_inactive_form.php:67
 msgid "No members are eligible for removal."
@@ -6099,7 +6099,7 @@ msgstr "チームの名前"
 
 #: ../user/team_search.php:113
 msgid "Team search results"
-msgstr "チームの検査結果"
+msgstr "チームの検索結果"
 
 #: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
@@ -6114,7 +6114,7 @@ msgid ""
 "The following teams match one or more of your search criteria.\n"
 "            To join a team, click its name to go to the team page,\n"
 "               then click %1Join this team%2."
-msgstr "以下のチームが検索条件のうち1つ以上に合致しました。\n            チームに参加するにはその名前をクリックしてそのチームのページ\n               に行き、%1このチームに参加%2をクリックしてください。"
+msgstr "以下のチームが検索条件のうち1つ以上に合致しました。\nチームに参加するには、その名前をクリックしてそのチームのページに行き、%1このチームに参加%2をクリックしてください。"
 
 #: ../user/team_search.php:128
 msgid "Change your search"
@@ -6124,7 +6124,7 @@ msgstr "検索条件を変える"
 msgid ""
 "You can team up with other people with similar interests, or from the same "
 "country, company, or school."
-msgstr "チームは、似かよった興味を持った人、同じ国・会社・学校の人などと一緒になって結成することができます。"
+msgstr "チームは、同じような興味を持った人、同じ国・会社・学校の人などと一緒になって結成することができます。"
 
 #: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
@@ -6132,12 +6132,12 @@ msgstr "このフォームを使ってあなたに適切なチームを探して
 
 #: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
-msgstr "今のところチームへの参加に%1私は興味がありません%2。"
+msgstr "私は今のところ%1チームへの参加に興味がありません%2。"
 
 #: ../user/top_hosts.php:67 ../user/top_teams.php:102
 #: ../user/top_users.php:113
 msgid "Limit exceeded - Sorry, first %1 items only"
-msgstr "制限値を超過 - 残念ですが、最初の %1項目のみ"
+msgstr "制限超過 - 残念ですが、最初の %1 項目のみ"
 
 #: ../user/top_hosts.php:82
 msgid "Top hosts"
@@ -6177,7 +6177,7 @@ msgstr "何でもよい"
 
 #: ../user/user_search.php:56
 msgid "With profile?"
-msgstr "自己紹介の記入があるかどうか"
+msgstr "プロフィールの記入があるかどうか"
 
 #: ../user/user_search.php:57 ../user/user_search.php:62
 msgid "Either"
@@ -6217,7 +6217,7 @@ msgstr "参加日時"
 
 #: ../user/user_search.php:133
 msgid "No users match your search criteria."
-msgstr "指定した条件に合う参加者はいませんでした。"
+msgstr "検索条件に合う参加者はいませんでした。"
 
 #: ../user/userw.php:35
 msgid "User not found!"
@@ -6245,23 +6245,23 @@ msgstr "チーム: なし"
 
 #: ../user/validate_email_addr.php:30
 msgid "Validate BOINC email address"
-msgstr "BOINCへEメイルアドレス確認"
+msgstr "BOINC のEメールアドレスを確認"
 
 #: ../user/validate_email_addr.php:31
 msgid ""
 "Please visit the following link to validate the email address of your %1 "
 "account:"
-msgstr "あなたが %1 アカウントに指定した Eメイルアドレスを確認するため、下記のリンクを訪れてください:"
+msgstr "あなたが %1 アカウントに指定した Eメールアドレスを確認するため、下記のリンクを訪問してください:"
 
 #: ../user/validate_email_addr.php:34
 msgid "Validate email sent"
-msgstr "送信された Eメイルに確認を返す"
+msgstr "送信された Eメールに確認を返す"
 
 #: ../user/validate_email_addr.php:35
 msgid ""
 "An email has been sent to %1. Visit the link it contains to validate your "
 "email address."
-msgstr "Eメイルを %1 に送信しました。そこに含まれるリンクをたどることによって、 あなたの Eメイルアドレスの正しさを証明してください。"
+msgstr "Eメールを %1 に送信しました。そこに含まれるリンクをたどって、あなたのEメールアドレスが正しいことを証明してください。"
 
 #: ../user/validate_email_addr.php:44
 msgid "No such user."
@@ -6269,7 +6269,7 @@ msgstr "該当する参加者はありません。"
 
 #: ../user/validate_email_addr.php:49
 msgid "Error in URL data - can't validate email address"
-msgstr "URLデータに異常あり - Eメイルアドレスが確認できません"
+msgstr "URLデータに異常あり - Eメールアドレスが確認できません"
 
 #: ../user/validate_email_addr.php:54
 msgid "Database update failed - please try again later."
@@ -6277,19 +6277,19 @@ msgstr "データベース更新失敗 - 後ほどやり直してください。
 
 #: ../user/validate_email_addr.php:57
 msgid "Validate email address"
-msgstr "Eメイルアドレスを確認する"
+msgstr "Eメールアドレスを確認する"
 
 #: ../user/validate_email_addr.php:58
 msgid "The email address of your account has been validated."
-msgstr "あなたのアカウントの Eメイルアドレスは確認済みです。"
+msgstr "あなたのアカウントのEメールアドレスは確認されています。"
 
 #: ../user/view_profile.php:38
 msgid "This user has no profile"
-msgstr "この参加者の自己紹介は登録されていません"
+msgstr "この参加者にはプロフィールがありません"
 
 #: ../user/view_profile.php:56
 msgid "Profile: %1"
-msgstr "自己紹介: %1"
+msgstr "プロフィール: %1"
 
 #: ../user/view_profile.php:65
 msgid "Account data"
@@ -6300,15 +6300,15 @@ msgid ""
 "You can access your account either by using your email address and password,\n"
 "    or by using an assigned 'account key'.\n"
 "    Your account key is:"
-msgstr "あなたはEメールアドレスとパスワード、もしくは割り当てられた「アカウント・キー」どちらかを使ってアカウントにアクセスできます。\nあなたのアカウント・キー : "
+msgstr "あなたはEメールアドレスとパスワード、もしくは割り当てられた「アカウント・キー」どちらかを使ってアカウントにアクセスできます。\nあなたのアカウント・キー:"
 
 #: ../user/weak_auth.php:57
 msgid "This key can be used to:"
-msgstr "このキーは以下のことに使用されることが可能です : "
+msgstr "このキーは以下のことに使用することができます:"
 
 #: ../user/weak_auth.php:59
 msgid "log in to your account on the web"
-msgstr "ウェブサイト上であなたのアカウントにログイン"
+msgstr "ウェブ上であなたのアカウントへのログイン"
 
 #: ../user/weak_auth.php:61
 msgid ""
@@ -6316,11 +6316,11 @@ msgid ""
 "       To do so, install BOINC,\n"
 "       create a file named %1 in the BOINC\n"
 "       data directory, and set its contents to:"
-msgstr "BOINC マネージャを使用せずに、アカウントにコンピュータを接続します。\nそのためには、BOINCをインストールし、BOINCのデータディレクトリに %1 という名前のファイルを作成し、以下の内容を設定します : "
+msgstr "BOINC マネージャを使用せずに、アカウントにコンピュータを接続します。\nそのためには、BOINC をインストールし、BOINC のデータディレクトリに %1 という名前のファイルを作成し、以下の内容を設定します:"
 
 #: ../user/weak_auth.php:73
 msgid "Weak account key"
-msgstr "「弱い」アカウント・キー"
+msgstr "弱いアカウント・キー"
 
 #: ../user/weak_auth.php:74
 msgid ""
@@ -6329,7 +6329,7 @@ msgid ""
 "    If you want to attach untrusted or insecure computers to your account,\n"
 "    do so using your weak account key.\n"
 "    Your weak account key is:"
-msgstr "あなたの「弱いアカウント・キー」は前述のように、あなたのアカウントにコンピュータを接続するために使用することができますが、あなたのアカウントにログインするか、どのような方法でもアカウントを変更するために使用することはできません。\nアカウントに信頼されていないあるいは安全でないコンピュータを接続したい場合は、弱いアカウント・キーを使用してください。\nあなたの弱いアカウント・キー : "
+msgstr "あなたの「弱いアカウント・キー」は前述のように、あなたのアカウントにコンピュータを接続するために使用することができますが、あなたのアカウントにログインしたり、アカウントを変更するために使用することはどのような方法でもできません。\nアカウントに信頼されていないあるいは安全でないコンピュータをアカウントに接続したい場合は、弱いアカウント・キーを使用してください。\nあなたの弱いアカウント・キー : "
 
 #: ../user/weak_auth.php:81
 msgid ""
@@ -6351,7 +6351,7 @@ msgstr "アプリケーション"
 
 #: ../user/workunit.php:43
 msgid "canonical result"
-msgstr "標準的結果"
+msgstr "基準となる結果"
 
 #: ../user/workunit.php:46
 msgid "granted credit"
@@ -6359,7 +6359,7 @@ msgstr "認められた功績値"
 
 #: ../user/workunit.php:55
 msgid "Tasks in progress"
-msgstr "タスク 実行中"
+msgstr "タスクを実行中"
 
 #: ../user/workunit.php:55
 msgid "suppressed pending completion"
@@ -6409,7 +6409,7 @@ msgstr "あなたの経歴。"
 msgid ""
 "Tell us about yourself. You could tell us where you're from, your age, "
 "occupation, hobbies, or anything else about yourself."
-msgstr "ご自身について書いてください。どこ出身であるかとか、年齢、職業、趣味ほか、何でもあなたに関することをどうぞ。"
+msgstr "ご自身について書いてください。出身地、年齢、職業、趣味のほか、何でもあなたに関することをどうぞ。"
 
 #: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
@@ -6422,7 +6422,7 @@ msgid ""
 "    <li>What are your views about the project?\n"
 "    <li>Any suggestions?\n"
 "    </ol>"
-msgstr "%1についてどのような考えをお持ちか教えてください。<ol>\n    <li>なぜ %1 を走らせているのでしょうか?\n    <li>このプロジェクトについて何を期待していますか?\n    <li>その他にも示唆をいただけますか?\n    </ol>"
+msgstr "%1についてどのような考えをお持ちか教えてください。<ol>\n<li>なぜ %1 を稼働させているのでしょうか?\n<li>このプロジェクトについて何か意見がありますか?\n<li>その他にも提案をいただけますか?\n</ol>"
 
 #: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
@@ -6431,7 +6431,7 @@ msgstr "グラフィックの配色"
 #: ../project.sample/project_specific_prefs.inc:55
 #, no-php-format
 msgid "Maximum CPU % for graphics%10 ... 100%2"
-msgstr "グラフィックに割当てる最大CPU使用率(%)%10 ... 100%2"
+msgstr "グラフィックに割り当てる最大CPU使用率(%) %1 0 ... 100 %2"
 
 #: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
diff --git a/locale/ka/BOINC-Client.mo b/locale/ka/BOINC-Client.mo
new file mode 100644
index 0000000..df06ea5
Binary files /dev/null and b/locale/ka/BOINC-Client.mo differ
diff --git a/locale/ka/BOINC-Client.po b/locale/ka/BOINC-Client.po
new file mode 100644
index 0000000..a83c473
--- /dev/null
+++ b/locale/ka/BOINC-Client.po
@@ -0,0 +1,162 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# George Salukvadze <giosal90 at gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-15 22:25-0700\n"
+"PO-Revision-Date: 2015-05-26 12:38+0000\n"
+"Last-Translator: George Salukvadze <giosal90 at gmail.com>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/boinc/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: acct_mgr.cpp:450 acct_mgr.cpp:459
+msgid "Message from account manager"
+msgstr "შეტყობინება ანგარიშის მმართველისგან"
+
+#: client_msgs.cpp:81
+msgid "Message from server"
+msgstr "შეტყობინება სერვისგან"
+
+#: client_state.cpp:258
+msgid ""
+"Some tasks need more memory than allowed by your preferences.  Please check "
+"the preferences."
+msgstr "ზოგ დავაკებას სჭირდება მეტი მეხსიერება, ვიდრე დაშვებულია თქვენი პარამეტრებით. გთხოვთ, შეამოწმოთ პარამეტრები."
+
+#: client_state.cpp:520
+msgid "Couldn't write state file; check directory permissions"
+msgstr "მდგომარების ფაილი ვერ ჩაიწერა; გთხოვთ, შეამოწმოთ საქაღალდეს უფლებები"
+
+#: cs_cmdline.cpp:303
+msgid "The HTTP_PROXY environment variable must specify an HTTP proxy"
+msgstr "გარემოს ცვლადი HTTP_PROXY უნდა უთითებდეს HTTP პროქსის"
+
+#: cs_scheduler.cpp:613
+#, c-format
+msgid ""
+"You used the wrong URL for this project.  When convenient, remove this "
+"project, then add %s"
+msgstr "თქვენ იყენებთ არასწორ URL-ს ამ პროექტისთვის. როდესაც იქნება მოსახერხებელი, წაშალეთ ეს პროექტი, შემდეგ დაამატეთ %s"
+
+#: cs_statefile.cpp:828 ../sched/sched_types.cpp:259
+msgid "Syntax error in app_info.xml"
+msgstr "სინტაქსის შეცდომა app_info.xml-ში"
+
+#: cs_statefile.cpp:868
+msgid "File referenced in app_info.xml does not exist: "
+msgstr "ფაილი, რომელიც მითითებულია app_info.xml-ში, აღარ არსებობს:"
+
+#: current_version.cpp:91
+msgid "A new version of BOINC is available."
+msgstr "მისაწვდომელია BOINC-ის ახალი ვერსია."
+
+#: current_version.cpp:94 current_version.cpp:102
+msgid "Download"
+msgstr "გადმოწერა"
+
+#: log_flags.cpp:269 log_flags.cpp:449
+msgid "Unexpected text in cc_config.xml"
+msgstr "მოულოდნელი ტექსტი cc_config.xml-ში"
+
+#: log_flags.cpp:423 log_flags.cpp:475
+msgid "Unrecognized tag in cc_config.xml"
+msgstr "ამოუცნობი ტეგი cc_config.xml-ში"
+
+#: log_flags.cpp:440
+msgid "Missing start tag in cc_config.xml"
+msgstr "დაწყების ტეგი cc_config.xml-ში არ არსებობს"
+
+#: log_flags.cpp:465
+msgid "Error in cc_config.xml options"
+msgstr "შეცდომა cc_config.xml-ის ოპციებში"
+
+#: log_flags.cpp:483
+msgid "Missing end tag in cc_config.xml"
+msgstr "დასრულების ტეგი cc_config.xml-ში არ არსებობს"
+
+#: ../sched/handle_request.cpp:307
+msgid "Invalid or missing account key.  To fix, remove and add this project."
+msgstr "არასწორი ან არარსებული ანგარიშის გასაღები. გასასწორებლად, წაშალეთ და დაამატეთ ეს პროექტი."
+
+#: ../sched/handle_request.cpp:849
+msgid "Invalid code signing key.  To fix, remove and add this project."
+msgstr "არასწორი კოდის მოსაწერი გასაღები. გასასწორებლად, წაშალეთ და დაამატეთ ეს პროექტი."
+
+#: ../sched/handle_request.cpp:859
+msgid ""
+"The project has changed its security key.  Please remove and add this "
+"project."
+msgstr "პროექტმა შეცვალა თავისი უსაფრთხოების გასაღები. გთხოვთ, წაშალოთ და დაამატოთ ეს პროექტი."
+
+#: ../sched/handle_request.cpp:943
+msgid "This project doesn't support operating system"
+msgstr "ამ პროექტს არ აქვს ამ ოპერაციული სისტემის მხარდაჭერა"
+
+#: ../sched/handle_request.cpp:969
+msgid "This project doesn't support CPU type"
+msgstr "ამ პროექტს არ აქვს ამ ცპ-ს ტიპის მხარდაჭერა"
+
+#: ../sched/handle_request.cpp:993
+msgid ""
+"Your BOINC client software is too old.  Please install the current version."
+msgstr "თქვენი BOINC კლიენტის პროგრამული უზრუნველყოფა არის ნამეტანი ძველი. გთხოვთ, დააყენოთ მიმდინარე ვერსია."
+
+#: ../sched/handle_request.cpp:1259
+msgid "This project doesn't support computers of type"
+msgstr "ამ პროექტს არ აქვს შემდეგ ტიპის კომპიუტერების მხარდაჭერა"
+
+#: ../sched/sched_send.cpp:1092
+msgid ""
+"Upgrade to the latest driver to process tasks using your computer's GPU"
+msgstr "განაახლეთ დრაივერი ბოლო ვერსიამდე დავალებების დასამუშავებლად თქვენი კომპიუტერის გპ-ს მეშვეობით"
+
+#: ../sched/sched_send.cpp:1099
+msgid ""
+"Upgrade to the latest driver to use all of this project's GPU applications"
+msgstr "განაახლეთ დრაივერი ბოლო ვერსიამდე ამ პროექტის ყველა გპ აპლიკაციის გამოსაყენებლად"
+
+#: ../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 "თქვენი NVIDIA გპ-ს გამოსაყენებლად საჭიროა BOINC-ის ახალი ვერსია; გთხოვთ, განაახლოთ მიმდინარე ვერსიამდე"
+
+#: ../sched/sched_send.cpp:1146
+#, c-format
+msgid "An %s GPU is required to run tasks for this project"
+msgstr "ამ პროექტზე დავალებების გასაშვებად საჭიროა %s გპ"
+
+#: ../sched/sched_send.cpp:1262
+msgid "No tasks are available for the applications you have selected."
+msgstr "აიპლიკაციებისთვის, რომელიც თქვენ აირჩიეთ, არ არის მისაწვდომი დავალებები."
+
+#: ../sched/sched_send.cpp:1288
+msgid "Your computer type is not supported by this project"
+msgstr "ამ პროექტს არ აქვს თქვენი კომპიუტერის ტიპის მხარდაჭერა"
+
+#: ../sched/sched_send.cpp:1294
+msgid "Newer BOINC version required; please install current version"
+msgstr "საჭიროა BOINC-ის ახალი ვერსია; გთხოვთ, დააყენოთ მიმდინარე ვერსია"
+
+#: ../sched/sched_send.cpp:1305
+#, c-format
+msgid ""
+"Tasks for %s are available, but your preferences are set to not accept them"
+msgstr "მისაწვდომია დავალებები %s-ისთვის, მაგრამ თქვენი პარამეტრები დაყენებული ისე, რომ არ მიიღოთ ისინი."
+
+#: ../sched/sched_types.cpp:254
+msgid "Unknown app name in app_info.xml"
+msgstr "უცნობი აპლიკაციის სახელი app_info.xml-ში"
+
+#: ../sched/sched_version.cpp:214
+msgid "Your app_info.xml file doesn't have a usable version of"
+msgstr "თქვენს app_info.xml ფაილს არ აქვს შემდეგის გამოყენებადი ვერსია"
diff --git a/locale/ka/BOINC-Setup.mo b/locale/ka/BOINC-Setup.mo
new file mode 100644
index 0000000..8a39127
Binary files /dev/null and b/locale/ka/BOINC-Setup.mo differ
diff --git a/locale/ka/BOINC-Setup.po b/locale/ka/BOINC-Setup.po
new file mode 100644
index 0000000..7c1bc3f
--- /dev/null
+++ b/locale/ka/BOINC-Setup.po
@@ -0,0 +1,118 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# George Salukvadze <giosal90 at gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-26 00:00-0800\n"
+"PO-Revision-Date: 2015-05-26 13:12+0000\n"
+"Last-Translator: George Salukvadze <giosal90 at gmail.com>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/boinc/language/ka/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: Installer.cpp:124
+#, c-format
+msgid "Sorry, this version of %s requires system 10.5 or higher."
+msgstr "ბოდიში, %s-ის ეს ვერსია ითხოვს სისტემას 10.5 ან უფრო მაღალს."
+
+#: PostInstall.cpp:130 PostInstall.cpp:1136 uninstall.cpp:1618
+msgid "Yes"
+msgstr "დიახ"
+
+#: PostInstall.cpp:131 PostInstall.cpp:1137 uninstall.cpp:1619
+msgid "No"
+msgstr "არა"
+
+#: PostInstall.cpp:133
+msgid "Should BOINC run even when no user is logged in?"
+msgstr "გსურთ, რომ BOINC იყოს გაშვებული მაშინაც, როდესაც არც ერთი მომხმარებებლი არ არის შესული?"
+
+#: PostInstall.cpp:1416
+#, c-format
+msgid ""
+"Users who are permitted to administer this computer will automatically be allowed to run and control %s.\n"
+"\n"
+"Do you also want non-administrative users to be able to run and control %s on this Mac?"
+msgstr "მომხმარებლებს, ვისაც აქვს ამ კომპიუტერის ადმინისტრირების უფლება, ავტომატურად მიეცემათ უფლება გაუშვან და აკონტროლონ %s.\n\nგსურთ, ასევე არა-ადმინისტრატორ მომხმარებლებსაც ჰქონდეთ საშუალება გაუშვან და აკონტროლონ %s ამ მაკ-ზე?"
+
+#: PostInstall.cpp:1444
+#, c-format
+msgid "Do you want to set %s as the screensaver for all %s users on this Mac?"
+msgstr "გსურთ, დააყენოთ %s, როგორც ეკრანის გადამრჩენი, ყველა %s-ის მომხმარებლისთვის ამ მაკ-ზე?"
+
+#: uninstall.cpp:82
+msgid "OK"
+msgstr "ოკ"
+
+#: uninstall.cpp:136
+msgid "Permission error after relaunch"
+msgstr "უფლებათა შეცდომა თავიდან გაშვებისას"
+
+#: uninstall.cpp:141
+msgid ""
+"Removal may take several minutes.\n"
+"Please be patient."
+msgstr "წაშლამ შეიძლება დაიკავოს რამოდენიმე წუთი.\nგთხოვთ, მოითმინოთ."
+
+#: uninstall.cpp:156
+#, c-format
+msgid ""
+"Are you sure you want to completely remove %s from your computer?\n"
+"\n"
+"This will remove the executables but will not touch %s data files."
+msgstr "დარწმუნებული ხართ, რომ გსურთ %s-ის სრულად წაშლა თქვენი კომპიუტერიდან?\n\nეს წაშლის გაშვებად ფაილებს, მაგრამ არ შეეხება %s-ის მონაცემთა ფაილებს."
+
+#: uninstall.cpp:163
+#, c-format
+msgid "Canceled: %s has not been touched."
+msgstr "გაუქმებულია: %s არ იქნა შეხებული."
+
+#: uninstall.cpp:174
+#, c-format
+msgid "An error occurred: error code %d"
+msgstr "მოხდა შეცდომა: შეცდომის კოდი %d."
+
+#: uninstall.cpp:230
+msgid "name  of user"
+msgstr "მომხმარებლის სახელი"
+
+#: uninstall.cpp:272
+msgid ""
+"Do you also want to remove VirtualBox from your computer?\n"
+"(VirtualBox was installed along with BOINC.)"
+msgstr "გსურთ, ასევე წაშალოთ VirtualBox-ი თქვენი კომპიუტერიდან?\n(VirtualBox-ი იყო დაყენებული BOINC-თან ერთად.)"
+
+#: uninstall.cpp:312
+#, c-format
+msgid ""
+"Removal completed.\n"
+"\n"
+" You may want to remove the following remaining items using the Finder: \n"
+"the directory \"%s\"\n"
+"\n"
+"for each user, the file\n"
+"\"%s\"."
+msgstr "წაშლა იქნა დასრულებული.\n\nთქვენი შეიძლება ასევე გინდოდეთ მაძიებლის მეშვეობით შემდეგის წაშლა:\nსაქაღალდე \"%s\"\n\nყოველი მომხმარებლისთვის, ფაილი\n\"%s\"."
+
+#: uninstall.cpp:840
+#, c-format
+msgid ""
+"Enter your administrator password to completely remove %s from you computer.\n"
+"\n"
+msgstr "შეიყვანეთ თქვენი ადმინისტრატორის პაროლი %s-ის სრულად წასაშლელად თქვენი კომპიუტერიდან.\n\n"
+
+#: uninstall.cpp:1616
+msgid "Cancel"
+msgstr "გაუქმება"
+
+#: uninstall.cpp:1617
+msgid "Continue..."
+msgstr "გაგრძელება..."
diff --git a/locale/ko/BOINC-Drupal.po b/locale/ko/BOINC-Drupal.po
new file mode 100644
index 0000000..c972475
--- /dev/null
+++ b/locale/ko/BOINC-Drupal.po
@@ -0,0 +1,120 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME <EMAIL at ADDRESS>
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"POT-Creation-Date: 2015-04-17 14:29+0000\n"
+"PO-Revision-Date: 2015-04-18 15:47+0000\n"
+"Last-Translator: Rom Walton\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/boinc/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Email address"
+msgstr "Email 주소"
+
+msgid "Home"
+msgstr "집"
+
+msgid "Login"
+msgstr "로그인"
+
+msgid "search"
+msgstr "검색"
+
+msgid "Server status"
+msgstr "서버 상태"
+
+msgid "Language"
+msgstr "언어"
+
+msgid "Enter your @s email address."
+msgstr "@ 이메일 주소를 입력하세요."
+
+msgid "Join now"
+msgstr "지금 "
+
+msgid "I'm new"
+msgstr "새 사용"
+
+msgid "I'm a BOINC user"
+msgstr "BOINC 사용자입니다"
+
+msgid "Welcome back!"
+msgstr "재방문을 환영합니다!"
+
+msgid ""
+"Einstein at 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 at Home은 LIGO 중력파 감지기에서 뽑아온 데이터를 이용해 회전하는 중성자 별(흔히 펄서로 알려짐)에서 온 중력파를 찾기 위해서 여러분의 컴퓨터가 쉬는 동안에 화면 보호기를 실행해 연산을 하는 프로그램입니다."
+
+msgid "Learn more"
+msgstr "더 "
+
+msgid "View account"
+msgstr "계정 "
+
+msgid "About our screensaver"
+msgstr "화면 보호기에 대해 알아보기"
+
+msgid "Over 500,000 volunteers and counting."
+msgstr "5십만 이상의 기여자 혹은 그 이상."
+
+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 "공유-프로젝트 ID"
+
+msgid "Save changes"
+msgstr "변경사항 저장"
+
+msgid "Cancel"
+msgstr "취소"
+
+msgid "Change password"
+msgstr "비밀번호 변경"
diff --git a/locale/ko/BOINC-Manager.mo b/locale/ko/BOINC-Manager.mo
index 42a9088..6b7a0f2 100644
Binary files a/locale/ko/BOINC-Manager.mo and b/locale/ko/BOINC-Manager.mo differ
diff --git a/locale/ko/BOINC-Manager.po b/locale/ko/BOINC-Manager.po
index da127fa..f855ece 100644
--- a/locale/ko/BOINC-Manager.po
+++ b/locale/ko/BOINC-Manager.po
@@ -7,8 +7,8 @@ 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-01 11:10+0000\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-15 06:09+0000\n"
 "Last-Translator: Kangsan Lee <treppolse at gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/boinc/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\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
@@ -49,7 +49,7 @@ msgstr "이미 이 프로젝트를 수행하고 계십니까?"
 
 #: clientgui/AccountInfoPage.cpp:379
 msgid "&No, new user"
-msgstr "아니오, 새로운 사용자 입니다"
+msgstr "아니오, 새로운 사용자입니다"
 
 #: clientgui/AccountInfoPage.cpp:382
 msgid "&Yes, existing user"
@@ -174,6 +174,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
@@ -202,364 +204,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 "컴퓨터 선택(&S)..."
 
-#: 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 종료(&E) "
 
-#: 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:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "프로젝트를 추가합니다"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "계정 관리자 사용(&U)..."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "새로운 과학 프로젝트를 추가하거나 계정 관리자를 사용합니다"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "계정 관리자를 사용해서 이 컴퓨터를 제어할 수 있습니다."
 
-#: clientgui/AdvancedFrame.cpp:459
+#: 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 "BOINC 네트워크 활동을 정지시킵니다"
 
-#: 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"
@@ -569,39 +576,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)에 접속됨"
@@ -649,7 +656,9 @@ msgstr "%s 종료(&X) "
 msgid "%s - Communication"
 msgstr "%s - 통신 중"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "취소"
 
@@ -722,6 +731,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 "프로젝트 웹 페이지"
@@ -806,7 +816,8 @@ msgstr "%s 소유권이나 권한이 적절히 설정되지 않았습니다. %s
 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 ")"
 
@@ -816,7 +827,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 관리자"
 
@@ -868,6 +879,7 @@ msgstr "BOINC 관리자 다중 실행이 허용됨"
 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 "(자동 감지)"
@@ -890,13 +902,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 사용 중지"
 
@@ -904,52 +916,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 "새 공지 사항이 있습니다 - 보려면 클릭하세요."
 
@@ -1008,6 +1023,7 @@ msgstr "%s로부터 업데이트 완료"
 msgid "Update completed."
 msgstr "업데이트가 완료 되었습니다."
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "계정 관리자 사용"
@@ -1054,48 +1070,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr "BOINC는  GNU Lesser General Public License v3.0 하에 배포되고 있습니다."
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr "방문하기"
+msgid "For more information, visit "
+msgstr "더 자세한 정보를 원하면 "
 
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
-msgstr "보다 자세한 정보."
-
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "확인"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr "유효하지 않은 숫자"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr "유효하지 않은 시간. 해당 값은 0:00과 24:00사이이며 시간:분 형식이어야 합니다"
 
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:771
+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:772
 msgid "Number must be between 0 and 100"
 msgstr "숫자는 0과 100 사이여야 합니다"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "잘못된 입력값 발견"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 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:1171
 msgid "Confirmation"
 msgstr "확인됨"
 
@@ -1104,106 +1120,111 @@ 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\"웹 환경설정 사용\"을 클릭하면 다음 웹기반 설정 사용:"
 
-#: 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:215
 msgid "Use web prefs"
 msgstr "웹 환경설정 "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 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:688
 msgid "Computing"
 msgstr "연산"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 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:347
 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:357
 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:471
 msgid "Usage limits"
 msgstr "사용량 제한"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, 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:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr "최대 사용량"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% (프로세서)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1211,342 +1232,355 @@ msgid ""
 "and repeat."
 msgstr "연산하는 동안 매 몇 초간 CPU 온도 및 에너지 사용량을 줄이기 위해 연산의 일시중지/재개를 반복합니다. 예시: 75%는 3초간 연산을 하고 1초간 대기하며 이 동작을 반복합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% CPU 시간"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr "일시중지시"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr "컴퓨터가 배터리로 작동시 일시중지"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "배터리 전원으로 작동하는 상황일 때 연산을 일시중지시키려면 체크하세요."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr "컴퓨터 사용시 연산을 일시중지"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "컴퓨터가 사용 중인 동안 연산 및 파일 전송을 일시중지시키려면 체크하세요."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
 msgstr "컴퓨터가 사용 중일 동안 GPU 연산을 일시중지"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 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:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr "이 것은 컴퓨터가 '사용 중'인 상태인지 결정합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "'사용 중'은 마우스/키보드 입력 시간을 뜻합니다"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "분"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "비%s CPU 사용량이 이 값 이상일 때 일시중지"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "비BOINC CPU 사용량이 이 값 이상일 때 일시중지"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "컴퓨터가 다른 프로그램을 돌리느라 바쁠 때 연산을 일시중지시킵니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr "기타"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "컴퓨터를 부지런히 돌리기 위해 충분한 태스크를 저장합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr "최소한"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr "일치 작업량"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:384
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
 msgstr "최소 한도 이상으로 추가적인 태스크를 저장합니다. 또한 프로젝트 서버에 연락할 때 얼마나 많은 작업량을 요청할지 결정합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
 msgstr "추가적으로 유지할"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "여러 프로젝트를 수행할 경우,%s 가 얼마나 자주 그것들을 교체할지 결정합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr "태스크를 설정시간마다 전환"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:427
 msgid ""
 "This controls how often tasks save their state to disk, so that they can be "
 "restarted later."
 msgstr "태스크가 얼마나 자주 현재 상태를 디스크에 저장하는지 제어합니다. 이렇게 함으로써 태스크를 재시작할 수 있습니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
 msgstr "태스크 기록지점을 이 시간마다 기록"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr "초"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr "파일 전송 중 다운로드 속도 제한합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr "다운로드 속도 제한"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr "KB/초"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
 msgstr "파일 전송 중 최대 업로드  제한합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr "업로드 속도 "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr "예시: %s는 매 30일동안에는 최대 2000MB까지 전송하게 됩니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "Limit usage to"
 msgstr "사용량 제한"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr "MB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr "일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, c-format
 msgid ""
 "Check this only if your Internet provider modifies image files. Skipping "
 "verification reduces the security of %s."
 msgstr "인터넷 제공자가 이미지 파일을 변경할 경우에만 체크하세요. 검증을 건너 뛸 경우에는%s 의 보안성이 감소합니다. "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Skip data verification for image files"
 msgstr "이미지 파일 데이터 검증 건너뛰기"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
 msgstr "인터넷 접속 전에 확인"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr "모뎀, ISDN, VPN 연결시에만 유용합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
 msgstr "완료되면 접속 끊기"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "디스크"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%s는 이러한 설정값들중 제한된 부분만 사용합니다:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, 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:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr "최대 사용 한도"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, 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:593
 msgid "Leave at least"
 msgstr "최소한"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr "GB를 남겨둡니다"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, 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:610
 #, no-c-format
 msgid "% of total"
 msgstr "% (전체 용량 중)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr "메모리"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "컴퓨터 사용시 %s에서 사용하는 메모리를 제한합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 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:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, 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:637
 msgid "When computer is not in use, use at most"
 msgstr "컴퓨터 미사용시 최대 사용량"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "일시중지되는 동안 비GPU 태스크를 메모리에 남겨두기"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:647
 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:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "%s에서 사용하는 스왑 공간(페이지 파일)을 제한합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr "페이지/스왑 파일: 최대"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr "부터"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr "에서"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
 msgstr "각 날짜별로 특정 시간대에만 연산을 수행합니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr "이 시간 사이에만 연산:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
 msgstr "일주일 중 시간 설정을 덮어쓸 날"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr "선택한 요일에는 상기 시간 설정을 덮어쓰기:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr "월요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr "금요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr "화요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr "토요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr "수요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr "일요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr "목요일"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr "각 날짜별로 특정 기간에만 파일 전송이 이루어집니다."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr "이 시간 사이에만 전송:"
 
@@ -1585,15 +1619,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 "메시지"
 
@@ -1606,6 +1644,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 "모든 메시지를 클립보드에 복사"
 
@@ -1614,6 +1653,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 "
@@ -1621,6 +1661,7 @@ msgid ""
 msgstr "선택한 메세지를 클립보드로 복사합니다. 메세지를 클릭하는 동안 shift 키나 control 키를 눌러 여러 메세지를 선택할 수 있습니다"
 
 #: 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 "
@@ -1662,6 +1703,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 "제거"
 
@@ -1689,6 +1731,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"
@@ -1760,6 +1804,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)"
 
@@ -1816,10 +1861,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 "일반"
@@ -1836,7 +1883,7 @@ msgstr "사용자 이름"
 msgid "Team name"
 msgstr "팀 이름"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "자원 공유"
 
@@ -1951,11 +1998,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 "이름"
 
@@ -2015,7 +2062,8 @@ msgstr "디렉토리"
 msgid "Process ID"
 msgstr "프로세스 ID"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
 msgid "Local: "
 msgstr "로컬: "
 
@@ -2088,6 +2136,7 @@ msgid "Address:"
 msgstr "주소:"
 
 #: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "포트:"
 
@@ -2100,11 +2149,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 "암호:"
 
@@ -2299,6 +2350,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 "팀"
 
@@ -2464,6 +2516,8 @@ msgstr "사용자가 일시 정지시킨 프로젝트"
 msgid "Task suspended by user"
 msgstr "사용자가 일시 정지시킨 태스크"
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "일시 정지됨 - "
@@ -2620,7 +2674,7 @@ msgstr "프로젝트를 선택하려면 이를을 클릭하거나 하단에 URL
 msgid "Categories:"
 msgstr "카테고리:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "프로젝트:"
 
@@ -2779,528 +2833,230 @@ msgstr "자동 감지"
 msgid "SOCKS proxy"
 msgstr "SOCKS 프록시"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "스킨"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "사용 계약"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "사용자 인터페이스의 외형을 선택하세요."
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "다음 사용 계약을 읽어주세요:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "진단 메세지를 보여줍니다."
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "사용 계약에 동의합니다."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "고급 보기...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "사용 계약에 동의하지 않습니다."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "고급 사용자 그래픽 인터페이스를 표시합니다."
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "프로젝트가 일시적으로 불가능"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "화면 옵션과 프록시 환경을 설정합니다"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "프로젝트가 일시적으로 불가능합니다.\n\n나중에 다시 시도해주세요."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "계정 관리자가 일시적으로 불가능"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "기본값"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "계정 관리자가 일시적으로 불가능합니다.\n\n나중에 다시 시도해주세요."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "일시 정지"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "계속하려면 계정 키를 정의해 주세요."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "연산 일시중지"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "잘못된 계정 키; 올바른 계정 키를 입력하세요"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "연산 재개"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "확인 충돌"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "공지 사항"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "email 주소를 입력해 주세요"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "BOINC나 프로젝트에서 온 공지 사항을 보기 위해 창을 엽니다"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "잘못된 이메일 주소입니다; 올바른 이메일 주소를 입력 하세요"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "%s 도움말을 얻으세요"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "URL 없음"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "공지사항 수신 중. 잠시만 기다려 주세요..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "URL을 지정해주세요.\n예를 들어:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-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
+msgid "Invalid URL"
+msgstr "잘못된 URL"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "닫기"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "올바른 URL을 지정해주세요.\n예를 들어:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "%s - 공지 사항"
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s'은(는) 유효한 호스트 이름을 포함하고 있지 않습니다."
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "추가적인 설정은 고급 보기 상태로 변경 후 연산 환경 설정에서 선택하세요."
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s'은(는) 유효한 경로를 포함하고 있지 않습니다."
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "GB 디스크 공간"
+#. 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 "명령"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - 연산 환경 설정"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "모든 메시지 복사"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "모든 로컬 환경설정을 취소하고 웹기반 환경설정을 사용하겠습니까?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "선택한 메시지 복사"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "이 프로젝트만 보여주기"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "선택한 프로젝의 메세지만 보여줍니다."
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "메시지"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "모든 메시지를 클립보드에 복사 중..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "선택한 메시지를 클립보드로 복사하고 있습니다..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "메세지를 걸러내고 있습니다..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "모든 메시지 보여주기"
+
+#: clientgui/ViewMessages.cpp:495
+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/sg_ProjectCommandPopup.cpp:66
+#: 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/sg_ProjectCommandPopup.cpp:67
+#: 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/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "이 프로젝트의 새로운 태스크를 받지 않습니다."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "프로젝트 다시 설정"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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/sg_ProjectCommandPopup.cpp:91
+#: 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/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 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/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "계정"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "이 프로젝트의 새 태스크를 수용합니다."
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+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 "많은 과학 분야의 30개 이상 프로젝트중에서 하나 혹은 전부 참여하는 기여자"
-
-#: 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 "사용 계약"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "다음 사용 계약을 읽어주세요:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "사용 계약에 동의합니다."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "사용 계약에 동의하지 않습니다."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "프로젝트가 일시적으로 불가능"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "프로젝트가 일시적으로 불가능합니다.\n\n나중에 다시 시도해주세요."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "계정 관리자가 일시적으로 불가능"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "계정 관리자가 일시적으로 불가능합니다.\n\n나중에 다시 시도해주세요."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "계속하려면 계정 키를 정의해 주세요."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "잘못된 계정 키; 올바른 계정 키를 입력하세요"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "확인 충돌"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "email 주소를 입력해 주세요"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "잘못된 이메일 주소입니다; 올바른 이메일 주소를 입력 하세요"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "URL 없음"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "URL을 지정해주세요.\n예를 들어:\nhttp://www.example.com/"
-
-#: 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 "잘못된 URL"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "올바른 URL을 지정해주세요.\n예를 들어:\nhttp://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s'은(는) 유효한 호스트 이름을 포함하고 있지 않습니다."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s'은(는) 유효한 경로를 포함하고 있지 않습니다."
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "명령"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "모든 메시지 복사"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "선택한 메시지 복사"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "이 프로젝트만 보여주기"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "선택한 프로젝의 메세지만 보여줍니다."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "메시지"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "모든 메시지를 클립보드에 복사 중..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "선택한 메시지를 클립보드로 복사하고 있습니다..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "메세지를 걸러내고 있습니다..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "모든 메시지 보여주기"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "모든 프로젝트의 메세지를 보여줍니다."
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "계정"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "완료된 작업"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "평균 완료된 작업"
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
+msgstr "평균 완료된 작업"
 
 #: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
@@ -3335,14 +3091,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 "사용자가 요청함"
@@ -3626,195 +3416,444 @@ msgstr ".\n활동 메뉴에서 다시 활성화시킬 수 있습니다."
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "현재 전송을 다시 시도 중..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "현재 전송을 다시 시도 중..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "전송 중단 중..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "정말로 현재 전송 중인 파일 '%s'을(를) 중단할까요?\n주의: 전송을 중단하면 태스크를 무효화하며, 해당 태스크에\n대한 크레딧을 받지 못하게 됩니다."
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "파일 전송 중단"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "업로드"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "다운로드"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "다시 시도 "
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "실패"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "일시 정지됨"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "활성"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "대기 중"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr " (프로젝트 전송 지연: "
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "활성 태스크 보여주기"
+
+#: 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 "VM 콘솔 보여주기"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "VM 콘솔 창을 보여줍니다."
+
+#: clientgui/ViewWork.cpp:233
+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 "남은 시간 (추정치)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "리포트 마감 시각"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "태스크"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "태스크 다시 시작 중..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "태스크 일시 정지 중..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "태스크 그래픽 보여주는 중..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "VM 콘솔용 태스크 보여주는 중..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "정말로 태스크 '%s'를(을) 중단할까요?\n(진행률: %s, 상태: %s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+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 "태스크 중단 중..."
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "모든 태스크 보여주기"
+
+#: clientgui/ViewWork.cpp:859
+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:571
+msgid "Do you really want to cancel?"
+msgstr "정말 취소할까요?"
+
+#: clientgui/WizardAttach.cpp:572
+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:360
+#, 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:340
+msgid "GB of disk space"
+msgstr "GB 디스크 공간"
+
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - 연산 환경 설정"
+
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "모든 로컬 환경설정을 취소하고 웹기반 환경설정을 사용하겠습니까?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "프로젝트 추가"
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "전송 중단 중..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "동기화"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "정말로 현재 전송 중인 파일 '%s'을(를) 중단할까요?\n주의: 전송을 중단하면 태스크를 무효화하며, 해당 태스크에\n대한 크레딧을 받지 못하게 됩니다."
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "이 프로젝트의 작업 완료"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "파일 전송 중단"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "많은 과학 분야의 30개 이상 프로젝트중에서 하나 혹은 전부 참여하는 기여자"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "업로드"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "계정 관리자 시스템과 프로젝트를 동기화"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-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/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "다시 시도 "
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "프로젝트 웹 페이지"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "실패"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "프로젝트 명령"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "일시 정지됨"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "메뉴에서 %s 프로젝트 웹 사이트를 띄웁니다"
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
-msgstr "활성"
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "%s 프로젝트에 적용할 명령 메뉴를 띄웁니다"
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "대기 중"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "이 태스크를 일시 중지합니다."
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr " (프로젝트 전송 지연: "
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "이 태스크를 포기합니다. 크래딧을 얻을 수 없게 됩니다."
 
-#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-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/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "활성된 태스크만 보여줍니다."
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "어떤 프로젝트도 없습니다. 프로젝트를 추가해주세요."
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "VM 콘솔 보여주기"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "사용 불가"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "VM 콘솔 창을 보여줍니다."
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "태스크:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-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/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "이 결과에서 작업을 버립니다. 크래딧을 얻을 수 없게됩니다."
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "알림:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "남은 시간 (추정치)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "이 태스크의 진행률"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "리포트 마감 시각"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "태스크 명령"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "태스크"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "이 태스크에 적용할 명령 메뉴를 띄웁니다"
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "태스크 다시 시작 중..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "응용 프로그램: %s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "태스크 일시 정지 중..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "태스크 그래픽 보여주는 중..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "응용 프로그램: 사용 불가"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "VM 콘솔용 태스크 보여주는 중..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "사용 불가"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "정말로 태스크 '%s'를(을) 중단할까요?\n(진행률: %s, 상태: %s)"
+msgid "Elapsed: %s"
+msgstr "경과 시간: %s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "정말로 태스크 '%d'를(을) 중단하겠습니까?"
+msgid "Remaining (estimated): %s"
+msgstr "남은 시간 (추정치): %s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "태스크 중단 중..."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "상태: %s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "모든 태스크 보여주기"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "현재 상태를 복구중."
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "모든 태스크를 보여줍니다."
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "작업 유닛을 서버에서 다운로드하고 있습니다."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "계정 관리자 혹은 프로젝트에 추가합니다"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "작업 일시 정지: 컴퓨터가 배터리로 가동되고 있습니다."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "프로젝트 추가하거나 BOINC 계정 관리자를 사용합니다"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+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\n이 마법사 목록에서 제공하지 않거나\n%s를 통해 관리되는 프로젝트가 추가되었습니다."
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "작업 일시 정지: 사용자가 작업을 중지시켰습니다."
 
-#: 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여러분이 원하는 만큼 그 활동에 상당부분 기여할 수 있습니다.\n직접 프로젝트를 추가하거나\n'계정 관리자' 웹 사이트를 사용해서 프로젝트를 선택할 수 있습니다."
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "작업 일시 정지: 설정한 시간이 아닙니다."
 
-#: 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\n이러한 프로젝트들 중 일부는 World Community Grid에서 수행 및 관리되고 있으며, 그외는\n다른 연구자 혹은 기관에서 수행 및 관리되고 있습니다. BOINC 소프트웨어에서는\n프로젝트들을 통틀어서 소모되는 연산력을 분할해 줄 수 있습니다.\n\n대안으로서 만약 여러분이 BOINC 계정 관리자에 등록되어 있다면, 여러분이 지원할\n프로젝트를 선택하는데 있어 이것을 사용할 수 있습니다.\n\n여러분이 선호하는 관리 방식을 선택해 주십시오:\n"
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "작업 일시 정지: 벤치마크를 실행하고 있습니다."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "BOINC 계정 관리자를 사용합니다"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "작업이 일시 정지되었습니다."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "World Community Grid 프로젝트를 추가 혹은 변경"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "프로젝트 서버 접속을 기다리고 있습니다."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "다른 연구자나 기관에서 수행 중인 프로젝트 추가"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "현재 상태 복구중"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "정말 취소할까요?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "수행가능한 작업이 없습니다"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-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 >"
@@ -3828,32 +3867,7 @@ msgstr "< 뒤로"
 msgid "&Finish"
 msgstr "완료"
 
-#: 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/locale/ko/BOINC-Project-Generic.po b/locale/ko/BOINC-Project-Generic.po
index dcab6b3..05b9c62 100644
--- a/locale/ko/BOINC-Project-Generic.po
+++ b/locale/ko/BOINC-Project-Generic.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-03-04 08:56 PST\n"
-"PO-Revision-Date: 2015-04-01 11:22+0000\n"
+"PO-Revision-Date: 2015-05-15 08:54+0000\n"
 "Last-Translator: Kangsan Lee <treppolse at gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/boinc/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/ko/BOINC-Web.mo b/locale/ko/BOINC-Web.mo
index 984f5d7..f59c2c9 100644
Binary files a/locale/ko/BOINC-Web.mo and b/locale/ko/BOINC-Web.mo differ
diff --git a/locale/ko/BOINC-Web.po b/locale/ko/BOINC-Web.po
index 0fa43de..1a9411e 100644
--- a/locale/ko/BOINC-Web.po
+++ b/locale/ko/BOINC-Web.po
@@ -8,11 +8,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2015-02-08 22:34+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"PO-Revision-Date: 2015-04-22 12:56+0000\n"
+"Last-Translator: Rom Walton\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/boinc/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/nl/BOINC-Web.mo b/locale/nl/BOINC-Web.mo
index 9d272d7..6c74b5d 100644
Binary files a/locale/nl/BOINC-Web.mo and b/locale/nl/BOINC-Web.mo differ
diff --git a/locale/nl/BOINC-Web.po b/locale/nl/BOINC-Web.po
index 9bcb512..ee8f3a7 100644
--- a/locale/nl/BOINC-Web.po
+++ b/locale/nl/BOINC-Web.po
@@ -8,11 +8,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2015-02-08 23:35+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"PO-Revision-Date: 2015-04-22 12:56+0000\n"
+"Last-Translator: Rom Walton\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/boinc/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/pt_PT/BOINC-Manager.mo b/locale/pt_PT/BOINC-Manager.mo
index 831dd1c..a92ccb6 100644
Binary files a/locale/pt_PT/BOINC-Manager.mo and b/locale/pt_PT/BOINC-Manager.mo differ
diff --git a/locale/pt_PT/BOINC-Manager.po b/locale/pt_PT/BOINC-Manager.po
index c8a1199..587f95e 100644
--- a/locale/pt_PT/BOINC-Manager.po
+++ b/locale/pt_PT/BOINC-Manager.po
@@ -8,8 +8,8 @@ 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-03-26 00:34+0000\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-05 09:59+0000\n"
 "Last-Translator: Miguel Filipe Paulino de Sousa Veiga <Miguel.veig at gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/boinc/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\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
@@ -129,7 +129,7 @@ msgstr "Actualizar o gestor de conta"
 
 #: clientgui/AccountInfoPage.cpp:560
 msgid "Use account manager"
-msgstr "Usar gestor de conta"
+msgstr "Utilizar gestor de conta"
 
 #: clientgui/AccountInfoPage.cpp:567
 msgid "Please enter a user name."
@@ -175,6 +175,8 @@ msgstr "Abrir página web"
 msgid "Visit this account manager's web site"
 msgstr "Visitar o website deste gestor de conta"
 
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
 #: clientgui/AccountManagerProcessingPage.cpp:186
 #: clientgui/AccountManagerPropertiesPage.cpp:192
 #, c-format
@@ -197,370 +199,375 @@ msgstr "Ocorreu um erro interno no servidor.\n"
 
 #: clientgui/AdvancedFrame.cpp:99
 msgid "Connected"
-msgstr "Conectado"
+msgstr "Ligado"
 
 #: clientgui/AdvancedFrame.cpp:107
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: clientgui/AdvancedFrame.cpp:325
+#: clientgui/AdvancedFrame.cpp:327
 #, c-format
 msgid "New %s window..."
 msgstr "Nova %s janela..."
 
-#: clientgui/AdvancedFrame.cpp:329
+#: clientgui/AdvancedFrame.cpp:331
 #, c-format
 msgid "Open another %s window"
 msgstr "Abrir outra %s janela"
 
-#: clientgui/AdvancedFrame.cpp:340
+#: clientgui/AdvancedFrame.cpp:342
 msgid "Select computer..."
 msgstr "Seleccionar computador..."
 
-#: clientgui/AdvancedFrame.cpp:341
+#: clientgui/AdvancedFrame.cpp:343
 msgid "Connect to a BOINC client on another computer"
-msgstr "Conectar-se a um cliente BOINC noutro computador"
+msgstr "Ligar a um cliente BOINC noutro computador"
 
-#: clientgui/AdvancedFrame.cpp:345
+#: clientgui/AdvancedFrame.cpp:347
 msgid "Shut down connected client..."
 msgstr "Desligar cliente ligado..."
 
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:348
 msgid "Shut down the currently connected BOINC client"
 msgstr "Desligar o cliente BOINC actualmente ligado"
 
-#: clientgui/AdvancedFrame.cpp:351
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
 #, c-format
 msgid "Close the %s window"
 msgstr "Fechar a janela do %s"
 
-#: clientgui/AdvancedFrame.cpp:354
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
 msgid "&Close window"
 msgstr "&Fechar janela"
 
-#: 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 "Sair do %s"
 
-#: clientgui/AdvancedFrame.cpp:386
-msgid "Preferences…"
-msgstr "Preferências..."
+#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+msgid "Preferences..."
+msgstr "Preferências"
 
-#: clientgui/AdvancedFrame.cpp:395
+#: clientgui/AdvancedFrame.cpp:398
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Notícias\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:396
+#: clientgui/AdvancedFrame.cpp:399
 msgid "Show notices"
 msgstr "Mostrar notícias"
 
-#: clientgui/AdvancedFrame.cpp:401
+#: clientgui/AdvancedFrame.cpp:404
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projectos\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:402
+#: clientgui/AdvancedFrame.cpp:405
 msgid "Show projects"
 msgstr "Mostrar projectos"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: clientgui/AdvancedFrame.cpp:410
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "&Tarefas\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:408
+#: clientgui/AdvancedFrame.cpp:411
 msgid "Show tasks"
 msgstr "Mostrar tarefas"
 
-#: clientgui/AdvancedFrame.cpp:413
+#: clientgui/AdvancedFrame.cpp:416
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "Trans&ferências\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:414
+#: clientgui/AdvancedFrame.cpp:417
 msgid "Show file transfers"
 msgstr "Mostrar transferências de ficheiros"
 
-#: clientgui/AdvancedFrame.cpp:419
+#: clientgui/AdvancedFrame.cpp:422
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "&Estatísticas\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:420
+#: clientgui/AdvancedFrame.cpp:423
 msgid "Show statistics"
 msgstr "Mostrar estatísticas"
 
-#: clientgui/AdvancedFrame.cpp:425
+#: clientgui/AdvancedFrame.cpp:428
 msgid "&Disk\tCtrl+Shift+D"
 msgstr "&Disco⇥Ctrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:429
 msgid "Show disk usage"
 msgstr "Mostrar utilização do disco"
 
-#: clientgui/AdvancedFrame.cpp:432
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Registo de Eventos...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:433
-msgid "Show diagnostic messages"
-msgstr "Mostrar mensagens de diagnóstico"
-
-#: clientgui/AdvancedFrame.cpp:439
+#: clientgui/AdvancedFrame.cpp:436
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "&Vista Simplificada ...\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:437
 msgid "Switch to the Simple View"
 msgstr "Trocar para a Vista Simples"
 
-#: clientgui/AdvancedFrame.cpp:454
-msgid "&Add project or account manager..."
-msgstr "&Adicionar projecto ou gestor de conta..."
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
+msgstr "&Adicionar projecto..."
+
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "Adicionar um projecto"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "&Utilizar gestor de conta..."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "Adicionar um novo projecto de ciência, ou utilizar um gestor de conta"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "Utilizar um gestor de conta para controlar este computador."
 
-#: clientgui/AdvancedFrame.cpp:459
+#: clientgui/AdvancedFrame.cpp:461
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Sincronizar com o %s"
 
-#: clientgui/AdvancedFrame.cpp:463
+#: clientgui/AdvancedFrame.cpp:465
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Obter as configurações actuais a partir de %s"
 
-#: clientgui/AdvancedFrame.cpp:473
-msgid "&Add project..."
-msgstr "&Adicionar projecto..."
-
-#: clientgui/AdvancedFrame.cpp:474
-msgid "Add a project"
-msgstr "Adicionar um projecto"
-
-#: clientgui/AdvancedFrame.cpp:477
+#: clientgui/AdvancedFrame.cpp:479
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Parar de utilizar o %s..."
 
-#: clientgui/AdvancedFrame.cpp:483
+#: clientgui/AdvancedFrame.cpp:485
 msgid "Remove this computer from account manager control."
 msgstr "Remover este computador do controlo do gestor de conta."
 
-#: clientgui/AdvancedFrame.cpp:489
+#: clientgui/AdvancedFrame.cpp:491
 msgid "Run CPU &benchmarks"
 msgstr "Executar &testes de perfomance do CPU"
 
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:492
 msgid "Run tests that measure CPU speed"
 msgstr "Executar testes que avaliem a velocidade do CPU"
 
-#: clientgui/AdvancedFrame.cpp:494
+#: clientgui/AdvancedFrame.cpp:496
 msgid "Retry pending transfers"
 msgstr "Tentar novamente transferências pendentes"
 
-#: clientgui/AdvancedFrame.cpp:495
+#: clientgui/AdvancedFrame.cpp:497
 msgid "Retry deferred file transfers and task requests"
 msgstr "Tentar novamente transferências de ficheiros deferidos e pedidos de tarefas"
 
+#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "Registo de Eventos...\tCtrl+Shift+E"
+
 #: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr "Mostrar mensagens de diagnóstico"
+
+#: clientgui/AdvancedFrame.cpp:511
 msgid "&Run always"
 msgstr "&Executar sempre"
 
-#: clientgui/AdvancedFrame.cpp:504
+#: clientgui/AdvancedFrame.cpp:512
 msgid "Allow work regardless of preferences"
 msgstr "Permitir execução de trabalho, independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:508
+#: clientgui/AdvancedFrame.cpp:516
 msgid "Run based on &preferences"
 msgstr "Executar com base nas &preferências"
 
-#: clientgui/AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:517
 msgid "Allow work according to preferences"
 msgstr "Permitir execução de trabalho de acordo com as preferências"
 
-#: clientgui/AdvancedFrame.cpp:513
+#: clientgui/AdvancedFrame.cpp:521
 msgid "&Suspend"
 msgstr "&Suspender"
 
-#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/AdvancedFrame.cpp:522
 msgid "Stop work regardless of preferences"
 msgstr "Parar execução de trabalho independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:539
+#: clientgui/AdvancedFrame.cpp:547
 msgid "Use GPU always"
 msgstr "Utilizar a GPU sempre"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:548
 msgid "Allow GPU work regardless of preferences"
 msgstr "Permitir a execução da GPU, independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:552
 msgid "Use GPU based on preferences"
 msgstr "Utilizar a GPU com base nas preferências"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:553
 msgid "Allow GPU work according to preferences"
 msgstr "Permitir a execução da GPU de acordo com as preferências"
 
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:557
 msgid "Suspend GPU"
 msgstr "Suspender a GPU"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:558
 msgid "Stop GPU work regardless of preferences"
 msgstr "Parar a execução da GPU, independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:574
+#: clientgui/AdvancedFrame.cpp:582
 msgid "Network activity always allowed"
 msgstr "Actividade de rede sempre permitida"
 
-#: clientgui/AdvancedFrame.cpp:575
+#: clientgui/AdvancedFrame.cpp:583
 msgid "Allow network activity regardless of preferences"
 msgstr "Permitir actividade de rede, independentemente das preferências"
 
-#: clientgui/AdvancedFrame.cpp:579
+#: clientgui/AdvancedFrame.cpp:587
 msgid "Network activity based on preferences"
 msgstr "Actividade de rede com base nas preferências"
 
-#: clientgui/AdvancedFrame.cpp:580
+#: clientgui/AdvancedFrame.cpp:588
 msgid "Allow network activity according to preferences"
 msgstr "Permitir actividade de rede de acordo com as preferências"
 
-#: clientgui/AdvancedFrame.cpp:584
+#: clientgui/AdvancedFrame.cpp:592
 msgid "Network activity suspended"
 msgstr "Actividade de rede suspensa"
 
-#: clientgui/AdvancedFrame.cpp:585
+#: clientgui/AdvancedFrame.cpp:593
 msgid "Stop BOINC network activity"
 msgstr "Parar actividade de rede do BOINC"
 
-#: clientgui/AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
 msgid "Computing &preferences..."
 msgstr "&Preferências de computação..."
 
-#: clientgui/AdvancedFrame.cpp:595
+#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
 msgid "Configure computing preferences"
 msgstr "Configurar preferências de computação"
 
-#: clientgui/AdvancedFrame.cpp:600
+#: clientgui/AdvancedFrame.cpp:608
 msgid "Exclusive applications..."
 msgstr "Aplicações exclusivas..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: clientgui/AdvancedFrame.cpp:609
 msgid "Configure exclusive applications"
 msgstr "Configurar aplicações exclusivas"
 
-#: clientgui/AdvancedFrame.cpp:606
+#: clientgui/AdvancedFrame.cpp:614
 msgid "Select columns..."
 msgstr "Seleccionar colunas..."
 
-#: clientgui/AdvancedFrame.cpp:607
+#: clientgui/AdvancedFrame.cpp:615
 msgid "Select which columns to display"
 msgstr "Seleccionar colunas a visualizar"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: clientgui/AdvancedFrame.cpp:619
 msgid "Event Log options...\tCtrl+Shift+F"
 msgstr "Opções do Log de Eventos...⇥Ctrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: clientgui/AdvancedFrame.cpp:620
 msgid "Enable or disable various diagnostic messages"
 msgstr "Habilita ou desabilita várias mensagens de diagnóstico"
 
-#: clientgui/AdvancedFrame.cpp:616
+#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
 msgid "&Other options..."
 msgstr "&Outras opções..."
 
-#: clientgui/AdvancedFrame.cpp:617
+#: clientgui/AdvancedFrame.cpp:625
 msgid "Configure display options and network settings"
 msgstr "Configurar opções de exibição e definições de rede"
 
-#: clientgui/AdvancedFrame.cpp:622
+#: clientgui/AdvancedFrame.cpp:630
 msgid "Read config files"
 msgstr "Ler ficheiros de configuração"
 
-#: clientgui/AdvancedFrame.cpp:623
+#: clientgui/AdvancedFrame.cpp:631
 msgid ""
 "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Ler informações de configuração em cc_config.mxl e quaisquer ficheiros em app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:627
+#: clientgui/AdvancedFrame.cpp:635
 msgid "Read local prefs file"
 msgstr "Ler ficheiro de preferências locais"
 
-#: clientgui/AdvancedFrame.cpp:628
+#: clientgui/AdvancedFrame.cpp:636
 msgid "Read preferences from global_prefs_override.xml."
-msgstr "Ler preferências em global_prefs_override.xml"
+msgstr "Ler preferências de global_prefs_override.xml"
 
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
 #, c-format
 msgid "%s &help"
 msgstr "%s &ajuda"
 
-#: clientgui/AdvancedFrame.cpp:640
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
 #, c-format
 msgid "Show information about %s"
 msgstr "Mostra informações sobre o %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:658
 #, c-format
 msgid "&%s help"
 msgstr "&%s ajuda"
 
-#: clientgui/AdvancedFrame.cpp:654
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
 msgid "Show information about the %s"
 msgstr "Mostra informações sobre o %s"
 
-#: clientgui/AdvancedFrame.cpp:665
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
 #, c-format
 msgid "%s &web site"
 msgstr "%s &Website"
 
-#: clientgui/AdvancedFrame.cpp:669
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Mostra informações sobre o BOINC e o %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 "&Acerca de %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
 msgid "Licensing and copyright information."
 msgstr "Licenciamento e informações sobre direitos de autor."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
 msgid "&File"
 msgstr "&Ficheiro"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr "&Visualizar"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:709
 msgid "&Activity"
 msgstr "&Actividade"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
 msgid "&Options"
 msgstr "&Opções"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
 msgid "&Tools"
 msgstr "&Ferramentas"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: clientgui/AdvancedFrame.cpp:1188
+#: clientgui/AdvancedFrame.cpp:1235
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Para de usar %s"
 
-#: clientgui/AdvancedFrame.cpp:1193
+#: clientgui/AdvancedFrame.cpp:1240
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -570,46 +577,46 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr "Se parar de utilizar o %s,\nmanterá todos os projectos actuais,\nmas terá que gerir os projectos manualmente.\n\nQuer parar de utilizar o %s?"
 
-#: clientgui/AdvancedFrame.cpp:1420
+#: clientgui/AdvancedFrame.cpp:1469
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Desligar o cliente actual..."
 
-#: 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 vai desligar o cliente ligado actualmente\ne ser-lhe-á solicitado para que se ligue a outro anfitrião."
+msgstr "%s irá desligar o cliente ligado actualmente\ne ser-lhe-á solicitado para que se ligue a outro anfitrião."
 
-#: 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 foi adicionado com sucesso %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 "A ligar a %s"
+msgstr "Ligando a %s"
 
-#: clientgui/AdvancedFrame.cpp:1984
+#: clientgui/AdvancedFrame.cpp:2033
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Ligado a %s (%s)"
 
 #: clientgui/AlreadyExistsPage.cpp:184
 msgid "Username already in use"
-msgstr "Nome de utilizador já em uso"
+msgstr "Nome de utilizador já em utilização"
 
 #: clientgui/AlreadyExistsPage.cpp:187
 msgid ""
@@ -621,7 +628,7 @@ msgstr "Uma conta com esse nome de utilizador já existe e tem uma\npalavra-pass
 
 #: clientgui/AlreadyExistsPage.cpp:191
 msgid "Email address already in use"
-msgstr "Endereço de e-mail já em uso"
+msgstr "Endereço de e-mail já em utilização"
 
 #: clientgui/AlreadyExistsPage.cpp:194
 msgid ""
@@ -650,7 +657,9 @@ msgstr "S&air %s"
 msgid "%s - Communication"
 msgstr "%s - Comunicação"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -669,11 +678,11 @@ msgstr "Não está autorizado actualmente a gerir o cliente.\nPor favor, contact
 msgid ""
 "Authorization failed connecting to running client.\n"
 "Make sure you start this program in the same directory as the client."
-msgstr "Autorização falhada ao conectar-se ao cliente em execução.\nConfirme que inicia este programa na mesma directoria que a do cliente."
+msgstr "Autorização falhada ao ligar-se ao cliente em execução.\nConfirme que inicia este programa na mesma directoria que a do cliente."
 
 #: clientgui/BOINCBaseFrame.cpp:532
 msgid "Authorization failed connecting to running client."
-msgstr "Autorização falhada ao conectar-se ao cliente em execução."
+msgstr "Autorização falhada ao ligar-se ao cliente em execução."
 
 #: clientgui/BOINCBaseFrame.cpp:540
 msgid "The password you have provided is incorrect, please try again."
@@ -689,7 +698,7 @@ msgstr "%s - Conexão Falhada"
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
-msgstr "%s não consegue se conectar ao %s cliente.\nQuer tentar conectar-se novamente?"
+msgstr "%s não consegue ligar-se ao cliente %s.\nQuer tentar ligar novamente?"
 
 #: clientgui/BOINCBaseFrame.cpp:629
 #, c-format
@@ -721,8 +730,9 @@ 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"
 "To connect up to your local computer please use 'localhost' as the host name."
-msgstr "%s não está actualmente conectado ao %s cliente.\nPor favor vá ao menu 'Avançado\\Escolher Computador...' para se conectar ao %s cliente.\nPara se conectar ao seu computador local, use 'localhost' como o nome de anfitrião."
+msgstr "%s não está actualmente ligado ao cliente %s.\nPor favor utilize o menu 'Avançado\\Escolher Computador...' para se ligar ao cliente %s.\nPara se ligar ao seu computador local, utilize o 'localhost' como o nome de anfitrião."
 
+#. Create the web sites task group
 #: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Páginas web do projecto"
@@ -749,17 +759,17 @@ msgstr "%s - Estado da Rede"
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
-msgstr "%s precisa de se conectar à Internet.\nPode fazê-lo agora?"
+msgstr "%s precisa de se ligar à Internet.\nPode fazê-lo agora?"
 
 #: clientgui/BOINCDialupManager.cpp:254
 #, c-format
 msgid "%s is connecting to the Internet."
-msgstr "%s está a conectar-se à Internet."
+msgstr "%s está a ligar-se à Internet."
 
 #: clientgui/BOINCDialupManager.cpp:303
 #, c-format
 msgid "%s has successfully connected to the Internet."
-msgstr "%s conectou-se com sucesso à Internet."
+msgstr "%s ligou-se com sucesso à Internet."
 
 #: clientgui/BOINCDialupManager.cpp:331
 #, c-format
@@ -771,17 +781,17 @@ msgstr "%s falhou a conexão à Internet."
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr "%s detectou que está actualmente conectado à Internet.\nA actualizar todos os projectos e a tentar novamente todas as transferências."
+msgstr "%s detectou que está actualmente ligado à Internet.\nA actualizar todos os projectos e a tentar novamente todas as transferências."
 
 #: clientgui/BOINCDialupManager.cpp:417
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
-msgstr "%s desconectou-se com sucesso da Internet."
+msgstr "%s desligou-se com sucesso da Internet."
 
 #: clientgui/BOINCDialupManager.cpp:433
 #, c-format
 msgid "%s failed to disconnected from the Internet."
-msgstr "%s falhou ao disconectar-se da Internet."
+msgstr "%s falhou ao desligar-se da Internet."
 
 #: clientgui/BOINCGUIApp.cpp:597
 #, c-format
@@ -794,7 +804,7 @@ msgid ""
 " or\n"
 "  - contact your administrator to add you to the 'boinc_master'\n"
 "     user group."
-msgstr "Não está autorizado a gerir o cliente.\n\nPara executar %s como este utilizador, por favor:\n  - reinstale %s respondendo \"Sim\" à questão acerca de\n    utilizadores não administrativos\nou\n  - contacte o seu administrador para o adicionar ao  grupo de utilizadores\n    'boinc_master'."
+msgstr "Não está autorizado de momento a gerir o cliente.\n\nPara executar o %s com este utilizador, por favor:\n  - reinstale o %s respondendo \"Sim\" à questão sobre\n    utilizadores não administrativos\nou\n  - contacte o seu administrador para o adicionar ao  grupo de utilizadores 'boinc_master'."
 
 #: clientgui/BOINCGUIApp.cpp:603
 #, c-format
@@ -807,7 +817,8 @@ msgstr "%s direitos ou permissões não definidas correctamente; por favor reins
 msgid " at "
 msgstr " em"
 
-#: clientgui/BOINCGUIApp.cpp:612
+#: clientgui/BOINCGUIApp.cpp:612 clientgui/MainDocument.cpp:2494
+#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
 msgid ")"
 msgstr ")"
 
@@ -817,13 +828,13 @@ msgid ""
 "Please reboot your computer and try again."
 msgstr "É necessário que reinicie o computador para que o BOINC seja executado correctamente.\nPor favor, reinicie o seu computador e tente novamente."
 
-#: clientgui/BOINCGUIApp.cpp:643
+#: clientgui/BOINCGUIApp.cpp:643 clientgui/DlgAbout.cpp:153
 msgid "BOINC Manager"
-msgstr "Gestor do BOINC"
+msgstr "BOINC Manager"
 
 #: clientgui/BOINCGUIApp.cpp:904
 msgid "BOINC Manager was started by the operating system automatically"
-msgstr "O Gestor do BOINC foi iniciado pelo sistema operativo automaticamente"
+msgstr "O BOINC Manager foi iniciado pelo sistema operativo automaticamente"
 
 #: clientgui/BOINCGUIApp.cpp:906
 msgid "Startup BOINC so only the system tray icon is visible"
@@ -863,12 +874,13 @@ msgstr "iniciar o modo de depuração para habilitar o gestor de mensagens de er
 
 #: clientgui/BOINCGUIApp.cpp:917
 msgid "multiple instances of BOINC Manager allowed"
-msgstr "multiplas instâncias do Gestor do BOINC permitidas"
+msgstr "multiplas instâncias do BOINC Manager permitidas"
 
 #: clientgui/BOINCGUIApp.cpp:919
 msgid "Not used: workaround for bug in XCode 4.2"
-msgstr "Não usado: solução para o bug no XCode 4.2"
+msgstr "Não utilizado: solução alternativa para esse bug no XCode 4.2"
 
+#. These are just special tags so deal with them in a special way
 #: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Detecção Automática)"
@@ -891,13 +903,13 @@ msgstr "Abrir %s Web..."
 msgid "Open %s..."
 msgstr "Abrir %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 "Suspender Temporariamente"
 
-#: 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 "Suspender GPU Temporariamente"
 
@@ -905,52 +917,55 @@ msgstr "Suspender GPU Temporariamente"
 msgid "E&xit"
 msgstr "S&air"
 
-#: 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 "Resumir"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:649
 msgid "Resume GPU"
 msgstr "Resumir GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: clientgui/BOINCTaskBar.cpp:715
 msgid "Computing is enabled"
 msgstr "Computação está activada"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: clientgui/BOINCTaskBar.cpp:719
 msgid "Computing is suspended - "
 msgstr "Computação está suspensa - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: clientgui/BOINCTaskBar.cpp:729
 msgid "GPU computing is enabled"
 msgstr "Computação por GPU está activada"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:732
 msgid "GPU computing is suspended - "
 msgstr "Computação por GPU está suspensa - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: clientgui/BOINCTaskBar.cpp:741
 msgid "Network is enabled"
 msgstr "Actividade de rede está activada"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: clientgui/BOINCTaskBar.cpp:744
 msgid "Network is suspended - "
 msgstr "Actividade de rede está suspensa - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: clientgui/BOINCTaskBar.cpp:752
 msgid "Reconnecting to client."
-msgstr "A reconectar-se ao cliente."
+msgstr "Ligando novamente ao cliente."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: clientgui/BOINCTaskBar.cpp:754
 msgid "Not connected to a client."
-msgstr "Não conectado ao cliente."
+msgstr "Não ligado ao cliente."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: clientgui/BOINCTaskBar.cpp:807
 #, c-format
 msgid "%s Notices"
 msgstr "%s Notícias"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: clientgui/BOINCTaskBar.cpp:813
 msgid "There are new notices - click to view."
 msgstr "Existem notícias novas - clique para visualizar."
 
@@ -1009,6 +1024,7 @@ msgstr "Actualização do %s concluída."
 msgid "Update completed."
 msgstr "Actualização concluída."
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Utilizando agora o gestor de conta"
@@ -1055,48 +1071,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr "O BOINC é distribuído sobre a Licença Pública GNU Lesser v3.0."
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr "Visite"
+msgid "For more information, visit "
+msgstr "Para mais informações, visite"
 
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
-msgstr "para mais informação."
-
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr "Hora inválida, o valor deve estar entre 0.00 e 24.00, o formato é HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:771
+msgid "Start time must be different from end time"
+msgstr "A hora de início tem de ser diferente da final."
+
+#: clientgui/DlgAdvPreferences.cpp:685
 msgid "Number must be between 0 and 10"
 msgstr "Os números devem ser entre 0 e 10"
 
-#: clientgui/DlgAdvPreferences.cpp:672
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:772
 msgid "Number must be between 0 and 100"
 msgstr "Os números devem ser entre 0 e 100"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "valor inválido de entrada detectado"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 msgid "Validation Error"
 msgstr "Erro de Validação"
 
-#: clientgui/DlgAdvPreferences.cpp:1119
+#: clientgui/DlgAdvPreferences.cpp:1158
 msgid "Discard local preferences and use web-based preferences?"
 msgstr "Rejeitar preferências locais e utilizar as preferências web?"
 
-#: clientgui/DlgAdvPreferences.cpp:1120
+#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1171
 msgid "Confirmation"
 msgstr "Confirmação"
 
@@ -1105,106 +1121,111 @@ msgstr "Confirmação"
 msgid "%s - Computing preferences"
 msgstr "%s - Preferências de computação"
 
-#: 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 "Utilizando preferências locais.\nClique em \"Utilizar preferências web\" para usar as preferências web de"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
 msgid "Using web-based preferences from"
 msgstr "Utilizando preferências web de"
 
-#: 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 "Defina valores e clique em OK para usar preferências locais."
+msgstr "Defina valores e clique em OK para utilizar as preferências locais."
 
-#: 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 "Esta caixa de diálogo controla as preferências para este computador apenas.\nClique em OK para definir as preferências.\nClique em Limpar para restaurar as definições web."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: clientgui/DlgAdvPreferencesBase.cpp:119
 msgid "Clear"
 msgstr "Limpar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:115
+#: clientgui/DlgAdvPreferencesBase.cpp:120
 msgid "Clear all local preferences and close the dialog."
 msgstr "Limpar todas as preferências locais e fechar a caixa de diálogo."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
+#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:215
 msgid "Use web prefs"
 msgstr "Utilizar preferências web"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 msgid "Restore web-based preferences and close the dialog."
 msgstr "Restaurar as preferências web e fechar a caixa de diálogo."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:143
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#. Computing schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:148
+#: clientgui/DlgAdvPreferencesBase.cpp:688
 msgid "Computing"
 msgstr "A computar"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 msgid "Network"
 msgstr "Rede"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
+#: clientgui/DlgAdvPreferencesBase.cpp:154
 msgid "Disk and memory"
 msgstr "Disco e memória"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:152
+#: clientgui/DlgAdvPreferencesBase.cpp:157
 msgid "Daily schedules"
 msgstr "Programações diárias"
 
-#: 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:347
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:166
+#: clientgui/DlgAdvPreferencesBase.cpp:171
 msgid "Save all values and close the dialog."
 msgstr "Salvar todos os valores e fechar a caixa de diálogo."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:172
+#: clientgui/DlgAdvPreferencesBase.cpp:177
 msgid "Close the dialog without saving."
 msgstr "Fechar a caixa de diálogo sem guardar."
 
-#: 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:357
 msgid "Help"
 msgstr "Ajuda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:182
 msgid "Shows the preferences web page."
 msgstr "Mostra  a página web das preferências."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:239
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:471
 msgid "Usage limits"
 msgstr "Limites de utilização"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, no-c-format
 msgid ""
 "Keep some CPUs free for other applications. Example: 75% means use 6 cores "
 "on an 8-core CPU."
 msgstr "Deixar alguns CPUs livres para outras aplicações. Exemplo: 75% significa utilizar 6 cores num CPU de 8 cores."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr "Usar no máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% dos CPUs"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1212,342 +1233,355 @@ msgid ""
 "and repeat."
 msgstr "Suspende/resume computação em alguns segundos para reduzir a temperatura do CPU e o consumo de energia. Exemplo: 75% significa realizar computação durante 3 segundos, aguardar 1 segundo e repetir."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% de tempo de CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr "Quando suspender"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr "Suspender quando o computador está apenas em bateria"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "Seleccione aqui para suspender computação nos portáteis quando em execução em bateria apenas."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr "Suspender quando o computador está em utilização"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "Seleccione aqui para suspender a computação e transferência de ficheiros quando estiver a utilizar o computador."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
-msgstr "Suspender computação da GPU quando o computador estiver em utilização"
+msgstr "Suspende computação da GPU quando o computador está a ser utilizado"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr "Seleccione aqui para suspender a computação da GPU quando estiver a utilizar o computador."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr "Isto determina quando o computador é considerado 'em utilização'."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "'Em utilização' significa actividade do rato/teclado nos últimos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "minutos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "Suspende quando a utilização do CPU não está acima de -%s"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Suspender quando a utilização do CPU por parte de terceiros for superior a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "Suspender computação quando o seu computador estiver ocupado executando outros programas."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr "Outro"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "Armazenar no mínimo tarefas suficientes para manter o computador ocupado para este período."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr "Armazenar no mínimo "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr "dias de trabalho"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:384
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
 msgstr "Armazene tarefas adicionais acima do nível mínimo. Determina a quantidade de trabalho que é pedido quando um projecto é contactado."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
 msgstr "Armazene até um adicional"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "Se executa vários projectos, %s pode trocar entre eles com esta frequência."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr "Trocar entre tarefas a cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:427
 msgid ""
 "This controls how often tasks save their state to disk, so that they can be "
 "restarted later."
 msgstr "Isto controla com que frequência as tarefas guardam no disco o seu estado, para que possam ser reiniciadas mais tarde."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
-msgstr "Solicitar às tarefas que criem um checkpoint no máximo a cada"
+msgstr "Pedir às tarefas que criem um checkpoint no máximo a cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr "segundos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr "Limitar a taxa de transferência dos ficheiros."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr "Limitar taxa de transferência para"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr "KB/segundo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
 msgstr "Limitar taxa de upload da transferência de ficheiros."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr "Limitar taxa de upload para"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr "Exemplo: %s deve transferir no máximo 2000 Mb de dados a cada 30 dias."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "Limit usage to"
 msgstr "Limitar utilização a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr "MB a cada"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr "dias"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, c-format
 msgid ""
 "Check this only if your Internet provider modifies image files. Skipping "
 "verification reduces the security of %s."
 msgstr "Seleccione aqui apenas se o seu fornecedor de Internet modificar os ficheiros de imagem. Saltar a verificação, reduz a segurança do %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Skip data verification for image files"
 msgstr "Saltar verificação de dados para imagens"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
-msgstr "Confirmar antes de se conectar à Internet"
+msgstr "Confirmar antes de se ligar à Internet"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
-msgstr "Útil apenas se tiver um modem, ISDN ou conexão VPN."
+msgstr "Útil apenas se tiver um modem, ISDN ou uma conexão VPN."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
-msgstr "Disconectar quando terminado"
+msgstr "Desligar quando terminado"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "Disco"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%s irá utilizar as definições mais restritivas:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, c-format
 msgid "Limit the total amount of disk space used by %s."
 msgstr "Limitar o espaço total em disco utilizado por %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:530
-#: clientgui/DlgAdvPreferencesBase.cpp:554
+#: clientgui/DlgAdvPreferencesBase.cpp:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr "Utilizar não mais do que"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, c-format
 msgid ""
 "Limit disk usage to leave this much free space on the volume where %s stores"
 " data."
 msgstr "Limita a utilização do disco para deixar esta quantidade de espaço livre no volume onde %s armazena os dados."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:542
+#: clientgui/DlgAdvPreferencesBase.cpp:593
 msgid "Leave at least"
 msgstr "Deixar pelo menos"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr "GB livres"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, c-format
 msgid ""
 "Limit the percentage of disk space used by %s on the volume where it stores "
 "data."
 msgstr "Limita a percentagem de disco utilizada pelo %s no volume onde armazena os dados."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: clientgui/DlgAdvPreferencesBase.cpp:610
 #, no-c-format
 msgid "% of total"
 msgstr "% do total "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr "Memória"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "Limita a memória utilizada pelo %s quando está a utilizar o computador."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 msgid "When computer is in use, use at most"
 msgstr "Quando o computador está a ser utilizado, usar no máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:579
-#: clientgui/DlgAdvPreferencesBase.cpp:591
-#: clientgui/DlgAdvPreferencesBase.cpp:607
+#: clientgui/DlgAdvPreferencesBase.cpp:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, c-format
 msgid "Limit the memory used by %s when you're not using the computer."
-msgstr "Limitar a utilização de memória por %s quando não estiver a utilizar o computador."
+msgstr "Limitar a utilização de memória pelo %s quando não estiver a utilizar o computador."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:586
+#: clientgui/DlgAdvPreferencesBase.cpp:637
 msgid "When computer is not in use, use at most"
 msgstr "Quando o computador não está a ser utilizado, usar no máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "Deixar tarefas não-GPU em memória enquanto estiverem suspensas"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:647
 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 "Se marcado, as tarefas suspensas ficam em memória e, retomam sem trabalho perdido. Se não estiver marcado, as tarefas suspensas são removidas da memória e, retoma a partir do seu último checkpoint."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:600
+#: clientgui/DlgAdvPreferencesBase.cpp:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "Limitar o espaço swap (ficheiro de paginação) utilizado por %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr "Página/ficheiro swap: usar no máximo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr "e"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr "para"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
 msgstr "Computação apenas durante um período do dia específico."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr "Computação apenas entre"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
 msgstr "Anular dia da semana"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr "Anular os horários acima dos dias seleccionados:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr "Segunda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr "Sexta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr "Terça"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr "Sábado"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr "Domingo"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr "Quinta"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr "Transferir ficheiros apenas durante um período específico do dia."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr "Transferir ficheiros apenas entre"
 
@@ -1586,15 +1620,19 @@ msgstr "Fechar caixa de diálogo sem guardar"
 msgid "%s - Event Log"
 msgstr "%s - Registo de Eventos"
 
-#: 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 "Projecto"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
 msgid "Time"
 msgstr "Tempo"
 
-#: clientgui/DlgEventLog.cpp:239
+#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
 msgid "Message"
 msgstr "Mensagem"
 
@@ -1607,6 +1645,7 @@ msgid "Copy &All"
 msgstr "Copiar &Todos"
 
 #: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Copiar todas as mensagens para a área de transferência."
 
@@ -1615,6 +1654,7 @@ msgid "Copy &Selected"
 msgstr "Copiar &Seleccionado"
 
 #: 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 "
@@ -1622,6 +1662,7 @@ msgid ""
 msgstr "Copiar as mensagens seleccionadas para a área de transferência. Pode seleccionar múltiplas mensagens pressionando o shift enquanto clica nas mensagens."
 
 #: 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 "
@@ -1663,6 +1704,7 @@ msgid "Add an application to this list"
 msgstr "Adicionar uma aplicação a esta lista"
 
 #: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:90
 msgid "Remove"
 msgstr "Remover"
 
@@ -1690,6 +1732,8 @@ msgstr "fechar caixa de diálogo sem salvar"
 msgid "shows the preferences web page"
 msgstr "mostra a página web das preferências"
 
+#. 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"
@@ -1737,7 +1781,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr "Solicitou a saída do %s,\nque lhe permite ver e gerir as tarefas\nem execução no seu computador.\n\nSe também quer parar as tarefas em execução,\nescolha uma das seguintes opções:"
+msgstr "Pediu para terminar o %s,\nque lhe permite ver e gerir as tarefas\nem execução no seu computador.\n\nSe também quer parar as tarefas em execução,\nescolha uma das seguintes opções:"
 
 #: clientgui/DlgExitMessage.cpp:135
 #, c-format
@@ -1761,6 +1805,7 @@ msgstr "Lembrar desta decisão e não mostrar esta caixa de diálogo."
 
 #: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
 #: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Cancelar"
 
@@ -1817,10 +1862,12 @@ msgstr " obtenção de trabalho suspenso por"
 msgid " work fetch deferral interval"
 msgstr " intervalo de suspensão de obtenção de trabalho"
 
+#. set dialog title
 #: clientgui/DlgItemProperties.cpp:239
 msgid "Properties of project "
 msgstr "Propriedades do projecto"
 
+#. layout controls
 #: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Geral"
@@ -1837,7 +1884,7 @@ msgstr "Nome de utilizador"
 msgid "Team name"
 msgstr "Nome da equipa"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "Quota de recursos"
 
@@ -1882,7 +1929,7 @@ msgstr "não"
 
 #: clientgui/DlgItemProperties.cpp:263
 msgid "Don't request more work"
-msgstr "Não solicitar mais trabalhos "
+msgstr "Não pedir mais trabalhos "
 
 #: clientgui/DlgItemProperties.cpp:265
 msgid "Scheduler call in progress"
@@ -1952,11 +1999,11 @@ msgstr "Duração do factor de correcção"
 msgid "Properties of task "
 msgstr "Propriedades da tarefa"
 
-#: clientgui/DlgItemProperties.cpp:357
+#: clientgui/DlgItemProperties.cpp:357 clientgui/ViewWork.cpp:266
 msgid "Application"
 msgstr "Aplicação"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: clientgui/DlgItemProperties.cpp:358 clientgui/ViewWork.cpp:267
 msgid "Name"
 msgstr "Nome"
 
@@ -2016,7 +2063,8 @@ msgstr "Directoria"
 msgid "Process ID"
 msgstr "ID do Processo"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
 msgid "Local: "
 msgstr "Local:"
 
@@ -2030,11 +2078,11 @@ msgstr "Linguagem:"
 
 #: clientgui/DlgOptions.cpp:185
 msgid "What language should BOINC use?"
-msgstr "Que idioma deve o BOINC usar?"
+msgstr "Que idioma deve o BOINC utilizar?"
 
 #: clientgui/DlgOptions.cpp:189
 msgid "Notice reminder interval:"
-msgstr "Lembrete de intervalo de noticias:"
+msgstr "Intervalo de advertência de noticias:"
 
 #: clientgui/DlgOptions.cpp:196
 msgid "How often should BOINC remind you of new notices?"
@@ -2046,7 +2094,7 @@ msgstr "Executar o Gestor no login?"
 
 #: clientgui/DlgOptions.cpp:207
 msgid "Run the BOINC Manager when you log on."
-msgstr "Executar o Gestor do BOINC quando se logar."
+msgstr "Executar o BOINC Manager quando se liga"
 
 #: clientgui/DlgOptions.cpp:212
 msgid "Enable Manager exit dialog?"
@@ -2070,15 +2118,15 @@ msgstr "&Limpar Predefinido"
 
 #: clientgui/DlgOptions.cpp:255
 msgid "Default Connection:"
-msgstr "Conexão Predefinida:"
+msgstr "Ligação Predefinida:"
 
 #: clientgui/DlgOptions.cpp:262
 msgid "Connections"
-msgstr "Conexões"
+msgstr "Ligações"
 
 #: clientgui/DlgOptions.cpp:271
 msgid "Connect via HTTP proxy server"
-msgstr "Conectar através do servidor HTTP proxy"
+msgstr "Ligar através de servidor HTTP proxy"
 
 #: clientgui/DlgOptions.cpp:275
 msgid "HTTP Proxy Server Configuration"
@@ -2089,6 +2137,7 @@ msgid "Address:"
 msgstr "Endereço:"
 
 #: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Porta:"
 
@@ -2101,11 +2150,13 @@ msgid "Leave these blank if not needed"
 msgstr "Deixar em branco se desnecessário"
 
 #: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Nome de Utilizador:"
 
 #: 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 "Palavra-passe:"
 
@@ -2115,7 +2166,7 @@ msgstr "HTTP Proxy"
 
 #: clientgui/DlgOptions.cpp:335
 msgid "Connect via SOCKS proxy server"
-msgstr "Conectar através de servidor SOCKS proxy"
+msgstr "Ligar através de servidor SOCKS proxy"
 
 #: clientgui/DlgOptions.cpp:339
 msgid "SOCKS Proxy Server Configuration"
@@ -2300,6 +2351,7 @@ msgid "The home page of the GEO-600 project"
 msgstr "A página principal do projecto GEO-600"
 
 #: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
+#: clientgui/ViewProjects.cpp:247 clientgui/ViewStatistics.cpp:441
 msgid "Team"
 msgstr "Equipa"
 
@@ -2369,7 +2421,7 @@ msgstr "A iniciar cliente"
 
 #: clientgui/MainDocument.cpp:591
 msgid "Connecting to client"
-msgstr "A conectar-se ao cliente"
+msgstr "Ligando-se ao cliente"
 
 #: clientgui/MainDocument.cpp:1205
 msgid "Retrieving system state; please wait..."
@@ -2395,7 +2447,7 @@ msgstr "computador em utilização"
 
 #: clientgui/MainDocument.cpp:2444
 msgid "user request"
-msgstr "solicitação do utilizador"
+msgstr "pedido do utilizador"
 
 #: clientgui/MainDocument.cpp:2445
 msgid "time of day"
@@ -2431,7 +2483,7 @@ msgstr "limite de largura de banda excedido"
 
 #: clientgui/MainDocument.cpp:2453
 msgid "requested by operating system"
-msgstr "solicitado pelo sistema operativo"
+msgstr "pedido pelo sistema operativo"
 
 #: clientgui/MainDocument.cpp:2455
 msgid "unknown reason"
@@ -2465,6 +2517,8 @@ msgstr "Projecto suspenso pelo utilizador"
 msgid "Task suspended by user"
 msgstr "Tarefa suspensa pelo utilizador"
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Suspenso - "
@@ -2568,7 +2622,7 @@ msgstr "Sem ligação à Internet"
 
 #: clientgui/NoInternetConnectionPage.cpp:182
 msgid "Please connect to the Internet and try again."
-msgstr "Por favor conecte-se à Internet e tente novamente."
+msgstr "Por favor ligue-se à Internet e tente novamente."
 
 #: clientgui/NotDetectedPage.cpp:181
 msgid "Project not found"
@@ -2591,7 +2645,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr "O URL que forneceu não é de uma conta com base no\nGestor BOINC.\n\nPor favor, verifique o URL e tente novamente."
+msgstr "O URL que forneceu não é de uma conta baseada no\nBOINC Manager.\n\nPor favor, verifique o URL e tente novamente."
 
 #: clientgui/NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2615,13 +2669,13 @@ msgstr "Escolha o projecto"
 
 #: clientgui/ProjectInfoPage.cpp:226
 msgid "To choose a project, click its name or type its URL below."
-msgstr "Para escolher o projecto, carregue nele ou escreva o URL em baixo."
+msgstr "Para escolher o projecto, clique nele ou escreva o URL em baixo."
 
 #: clientgui/ProjectInfoPage.cpp:242
 msgid "Categories:"
 msgstr "Categorias:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projectos:"
 
@@ -2741,7 +2795,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr "The World Community Grid - O software BOINC falhou ao realizar a comunicação\nà Internet. As razões mais prováveis são:\n\n1) Problemas de conectividade. Verifique a sua conexão à rede ou o modem,\ndepois clique em voltar Atrás e tente novamente.\n\n2) Software da firewall pessoal está a bloquear o World Community\nGrid - Software BOINC. Configure a sua firewall pessoal para permitir que o\nBOINC e o Gestor do BOINC comunique na porta 80 e na porta 443,\ndepois clique em voltar a [...]
+msgstr "The World Community Grid - O software BOINC falhou ao efectuar a comunicação\nà Internet. As razões mais prováveis são:\n\n1) Problemas de conectividade. Verifique a sua ligação à rede ou o modem,\ndepois clique em voltar Atrás e tente novamente.\n\n2) Software da firewall pessoal está a bloquear o World Community\nGrid - Software BOINC. Configure a sua firewall pessoal para permitir que o\nBOINC e o BOINC Manager comunique na porta 80 e na porta 443,\ndepois clique em voltar atr [...]
 
 #: clientgui/ProxyInfoPage.cpp:203
 msgid ""
@@ -2758,7 +2812,7 @@ msgid ""
 "\n"
 "3) You are using a proxy server.\n"
 "Click Next to configure BOINC's proxy settings."
-msgstr "O BOINC falhou ao realizar a comunicação à Internet.\nAs razões mais prováveis são:\n\n1) Problemas de conectividade. Verifique a rede\nou a conexão ao modem e depois clique em Voltar Atrás e tente novamente.\n\n2) Software da firewall pessoal está a bloquear o BOINC.\nConfigure a sua firewall pessoal para permitir o BOINC e\no Gestor do BOINC comunicar na porta 80,\ndepois clique em Voltar Atrás e tente novamente.\n\n3) Está a utilizar um servidor de proxy.\nClique em Próximo pa [...]
+msgstr "O BOINC falhou ao efectuar a comunicação à Internet.\nAs razões mais prováveis são:\n\n1) Problemas de conectividade. Verifique a rede\nou a ligação ao modem e depois clique em Voltar Atrás e tente novamente.\n\n2) Software da firewall pessoal está a bloquear o BOINC.\nConfigure a sua firewall pessoal para permitir o BOINC e\no BOINC Manager comunicar na porta 80,\ndepois clique em Voltar Atrás e tente novamente.\n\n3) Está a utilizar um servidor de proxy.\nClique em Próximo para [...]
 
 #: clientgui/ProxyPage.cpp:331
 msgid "Proxy configuration"
@@ -2780,528 +2834,230 @@ msgstr "Detectar automaticamente"
 msgid "SOCKS proxy"
 msgstr "Proxy SOCKS"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "Máscara"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Termos de Uso"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "Selecciona a aparência do interface de utilizador."
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Por favor, leia os seguintes termos de uso:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "Mostra as mensagens de diagnóstico."
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Concordo com os termos de uso."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Vista Avançada...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Não concordo com os termos de utilização."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "Mostra o interface gráfico avançado."
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projecto temporariamente indisponível"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "Configurar opções de visualização e configurações de proxy"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "O projecto está temporariamente indisponível.\n\nPor favor tente mais tarde."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Gestor de conta temporariamente indisponível"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "Predefinido"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "O gestor de conta está temporariamente indisponível.\n\nPor favor tente mais tarde."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "Suspender"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Por favor especifique uma chave de conta para continuar."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "Suspende a Computação"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Chave de Conta Inválida; por favor insira uma Chave de Conta Válida"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "Resume a Computação"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Conflito de validação"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "Notícias"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Por favor especifique um endereço de e-mail"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Abre uma janela para ver as notícias dos projectos ou do BOINC"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Endereço de e-mail inválido; por favor insira um endereço de e-mail válido"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "Obter ajuda com o %s"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "URL em falta"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "A pesquisar noitícias; por favor aguarde..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Por favor especifique um URL.\nPor exemplo:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Não existem notícias nesta altura."
+#: 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 "URL Inválido"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Fechar"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Por favor especifique um URL válido.\nPor exemplo:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "%s - Notícias"
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' não contém um nome de anfitrião válido."
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Para definições adicionais, seleccione Preferências de Computação na Vista Avançada"
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' não contém um caminho válido."
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "Gb de espaço em disco"
+#. 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 "Comandos"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Preferência de Computação"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Copiar todas as mensagens"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "Rejeitar todas as preferências locais e utilizar as preferências web?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Copiar as mensagens seleccionadas"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Mostrar apenas este projecto"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Mostrar apenas as mensagens para o projecto seleccionado."
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Mensagens"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "A copiar todas as mensagens para àrea de transferência..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "A copiar as mensagens seleccionadas para àrea de transferência..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "A filtrar mensagens..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Mostrar todas as mensagens"
+
+#: clientgui/ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Mostrar mensagens para todos os projectos."
+
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "A pesquisar noitícias; por favor aguarde..."
+
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Não existem notícias nesta altura."
+
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
+msgid "Notices"
+msgstr "Notícias"
+
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
 msgstr "Actualizar"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
+#: 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 "Reportar todas as tarefas concluídas, obter os últimos créditos, obter as últimas preferências e possivelmente mais tarefas."
 
+#: 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 "Suspender"
+
+#: 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 "Suspender tarefas para este projecto."
 
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:821
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
 msgid "No new tasks"
 msgstr "Não obter novas tarefas"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "Não obter novas tarefas para este projecto."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "Fazer reset ao projecto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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 "Eliminar todos os ficheiros e tarefas associadas a este projecto e, obter novas tarefas. Pode actualizar o projecto primeiro para reportar tarefas concluídas."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
+#: 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 "Remover este projecto. Tarefas em progresso serão perdidas (use 'Actualizar' primeiro para reportar tarefas concluídas)."
 
+#: clientgui/ViewProjects.cpp:231 clientgui/ViewWork.cpp:246
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
 msgid "Properties"
 msgstr "Propriedades"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr "Mostrar detalhes do projecto."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr "Resumir tarefas para este projecto."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "Permitir novas tarefas"
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "Conta"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "Permitir obtenção de novas tarefas para este projecto."
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+msgstr "Trabalho concluído"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-msgid "Don't fetch new tasks for this project."
-msgstr "Não obter novas tarefas para este projecto."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Tem a certeza que quer fazer o reset ao projecto '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-msgid "Reset Project"
-msgstr "Fazer Reset ao Projecto"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Tem a certeza que quer remover o projecto '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-msgid "Remove Project"
-msgstr "Remover Projecto"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Adicionar Projecto"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Trabalho realizado para este projecto"
-
-#: clientgui/sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Voluntarie-se para um ou alguns dos mais de 30 projectos, em várias áreas da ciência"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Sincroniza os projectos com o gestor de conta"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Seleccione o projecto para aceder com os controles em baixo"
-
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Páginas Web do Projecto"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Comandos do Projecto"
-
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Abre um menu de websites para o projecto %s"
-
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Abre um menu de comandos para aplicar ao projecto %s"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Mostrar gráficos"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Mostrar gráfico da aplicação numa janela."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Suspender esta tarefa."
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Cancelar"
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Abandonar esta tarefa. Não obterá créditos por ela."
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Mostrar detalhes da tarefa."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "A resumir trabalho para esta tarefa."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "A suspender trabalho para esta tarefa."
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr "Tem a certeza que quer cancelar esta tarefa '%s'?\n(Progresso: %.1lf%%, Estado: %s)"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Cancelar tarefa"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Não tem nenhuns projectos. Por favor adicione um Projecto."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Indisponível"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Tarefas:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Seleccione uma tarefa para aceder"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "De:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Progresso destas tarefas"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Comandos das Tarefas"
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Abrir um menu de comandos para aplicar a esta tarefa"
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Aplicação: %s"
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Aplicação: Indisponível"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Indisponível"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Decorrido: %s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Restante (estimado): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Estado: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1228
-msgid "Retrieving current status."
-msgstr "A rever o estado actual."
-
-#: clientgui/sg_TaskPanel.cpp:1234
-msgid "Downloading work from the server."
-msgstr "A realizar transferência de trabalho do servidor."
-
-#: clientgui/sg_TaskPanel.cpp:1239
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Processamento Suspenso:  A executar em Bateria."
-
-#: clientgui/sg_TaskPanel.cpp:1241
-msgid "Processing Suspended:  User Active."
-msgstr "Processamento Suspenso:  Utilizador Activo."
-
-#: clientgui/sg_TaskPanel.cpp:1243
-msgid "Processing Suspended:  User paused processing."
-msgstr "Processamento Suspenso:  O utilizador parou o processamento."
-
-#: clientgui/sg_TaskPanel.cpp:1245
-msgid "Processing Suspended:  Time of Day."
-msgstr "Processamento Suspenso:  Hora do Dia."
-
-#: clientgui/sg_TaskPanel.cpp:1247
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Processamento Suspenso:  A Executar Testes de Performance."
-
-#: clientgui/sg_TaskPanel.cpp:1249
-msgid "Processing Suspended."
-msgstr "Processamento Suspenso."
-
-#: clientgui/sg_TaskPanel.cpp:1253
-msgid "Waiting to contact project servers."
-msgstr "A aguardar contacto dos servidores do projecto."
-
-#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
-msgid "Retrieving current status"
-msgstr "A rever estado actual"
-
-#: clientgui/sg_TaskPanel.cpp:1261
-msgid "No work available to process"
-msgstr "Sem trabalhos disponíveis para processar"
-
-#: clientgui/sg_TaskPanel.cpp:1263
-msgid "Unable to connect to the core client"
-msgstr "Incapaz de se conectar ao core do cliente"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Termos de Uso"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Por favor, leia os seguintes termos de uso:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Eu concordo com os termos de uso."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Eu não concordo com os termos de utilização."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projecto temporariamente indisponível"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "O projecto está temporariamente indisponível.\n\nPor favor tente mais tarde."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Gestor de conta temporariamente indisponível"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "O gestor de conta está temporariamente indisponível.\n\nPor favor tente mais tarde."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Por favor especifique uma chave de conta para continuar."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Chave de Conta Inválida; por favor insira uma Chave de Conta Válida"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Conflito de validação"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Por favor especifique um endereço de e-mail"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Endereço de e-mail inválido; por favor insira um endereço de e-mail válido"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "URL em falta"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "Por favor especifique um URL.\nPor exemplo:\nhttp://www.example.com/"
-
-#: 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 "URL Inválido"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "Por favor especifique um URL válido.\nPor exemplo:\nhttp://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' não contém um nome de anfitrião válido."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' não contém um caminho válido."
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "Comandos"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Copiar todas as mensagens"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Copiar as mensagens seleccionadas"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Mostrar apenas este projecto"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Mostrar apenas as mensagens para o projecto seleccionado."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Mensagens"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "A copiar todas as mensagens para àrea de transferência..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "A copiar as mensagens seleccionadas para àrea de transferência..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "A filtrar mensagens..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Mostrar todas as mensagens"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Mostrar mensagens para todos os projectos."
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "Conta"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "Trabalho concluído"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "Média de trabalho realizado"
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
+msgstr "Média de trabalho realizado"
 
 #: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
@@ -3336,17 +3092,51 @@ msgstr "A notificar o projecto para não obter tarefas adicionais..."
 msgid "Resetting project..."
 msgstr "A fazer reset ao projecto..."
 
+#: clientgui/ViewProjects.cpp:518 clientgui/sg_ProjectCommandPopup.cpp:229
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "Tem a certeza que quer fazer o reset ao projecto '%s'?"
+
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:235
+msgid "Reset Project"
+msgstr "Fazer Reset ao Projecto"
+
 #: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "A remover projecto..."
 
+#: clientgui/ViewProjects.cpp:576 clientgui/sg_ProjectCommandPopup.cpp:266
+#, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "Tem a certeza que quer remover o projecto '%s'?"
+
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:272
+msgid "Remove Project"
+msgstr "Remover Projecto"
+
 #: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "A lançar o navegador..."
 
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
+msgstr "Resumir tarefas para este projecto."
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
+msgstr "Permitir novas tarefas"
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
+msgstr "Permitir obtenção de novas tarefas para este projecto."
+
+#: clientgui/ViewProjects.cpp:821 clientgui/sg_ProjectCommandPopup.cpp:137
+msgid "Don't fetch new tasks for this project."
+msgstr "Não obter novas tarefas para este projecto."
+
 #: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
-msgstr "Solicitado pelo utilizador"
+msgstr "Pedido pelo utilizador"
 
 #: clientgui/ViewProjects.cpp:1141
 msgid "To fetch work"
@@ -3362,7 +3152,7 @@ msgstr "Para enviar mensagem de aviso"
 
 #: clientgui/ViewProjects.cpp:1144
 msgid "Requested by account manager"
-msgstr "Solicitado pelo gestor de conta"
+msgstr "Pedido pelo gestor de conta"
 
 #: clientgui/ViewProjects.cpp:1145
 msgid "Project initialization"
@@ -3370,7 +3160,7 @@ msgstr "Inicialização do projecto"
 
 #: clientgui/ViewProjects.cpp:1146
 msgid "Requested by project"
-msgstr "Solicitado pelo projecto"
+msgstr "Pedido pelo projecto"
 
 #: clientgui/ViewProjects.cpp:1147
 msgid "Unknown reason"
@@ -3394,11 +3184,11 @@ msgstr "Irá remover quando as tarefas concluirem"
 
 #: clientgui/ViewProjects.cpp:1173
 msgid "Scheduler request pending"
-msgstr "Solicitação de agendamento pendente"
+msgstr "Pedido de agendamento pendente"
 
 #: clientgui/ViewProjects.cpp:1179
 msgid "Scheduler request in progress"
-msgstr "Solicitação de agendamento em progresso"
+msgstr "Pedido de agendamento em progresso"
 
 #: clientgui/ViewProjects.cpp:1182
 msgid "Trickle up message pending"
@@ -3571,7 +3361,7 @@ msgstr "Mostrar lista de projectos"
 
 #: clientgui/ViewStatistics.cpp:2394
 msgid "Uses smaller area for graphs"
-msgstr "Usar área mais pequena para os gráficos"
+msgstr "Utiliza uma área menor para os gráficos"
 
 #: clientgui/ViewTransfers.cpp:187
 msgid "Retry Now"
@@ -3627,195 +3417,444 @@ msgstr ".\nPode activá-la utilizando o menu Actividade."
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "A tentar transferir novamente..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "A tentar transferir novamente..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "A cancelar a transferência..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "Tem a certeza que quer cancelar a transferência deste ficheiro '%s'?\nNOTA: Cancelar uma transferência invalidará a tarefa e\nnão receberá crédito pela mesma."
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "Cancelar Transferência do Ficheiro"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "Upload"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "Transferir"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "tentar novamente em "
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "falhou"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "suspenso"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "activo"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "pendente"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr " (projecto backoff: "
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "Mostrar tarefas activas"
+
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
+msgid "Show only active tasks."
+msgstr "Mostrar apenas as tarefas activas."
+
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
+msgid "Show graphics"
+msgstr "Mostrar gráficos"
+
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
+msgid "Show application graphics in a window."
+msgstr "Mostrar gráfico da aplicação numa janela."
+
+#: clientgui/ViewWork.cpp:225
+msgid "Show VM Console"
+msgstr "Mostrar Consola VM"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "Mostrar Consola VM numa janela."
+
+#: clientgui/ViewWork.cpp:233
+msgid "Suspend work for this result."
+msgstr "Suspender trabalho para este resultado."
+
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
+msgid "Abort"
+msgstr "Cancelar"
+
+#: clientgui/ViewWork.cpp:240
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Abandonar resultado do trabalho. Não receberá crédito por ele."
+
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
+msgid "Show task details."
+msgstr "Mostrar detalhes da tarefa."
+
+#: clientgui/ViewWork.cpp:264
+msgid "Remaining (estimated)"
+msgstr "Restante (estimado)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "Data Limite"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "A resumir tarefa..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "A suspender tarefa..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "A mostrar gráficos para a tarefa..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "A mostrar Consola VM para a tarefa..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Tem a certeza que quer cancelar esta tarefa '%s'?\n(Progresso: %s, Estado: %s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Tem a certeza que quer cancelar estas %d tarefas?"
+
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
+msgid "Abort task"
+msgstr "Cancelar tarefa"
+
+#: clientgui/ViewWork.cpp:586
+msgid "Aborting task..."
+msgstr "A cancelar a tarefa..."
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "Mostrar todas as tarefas"
+
+#: clientgui/ViewWork.cpp:859
+msgid "Show all tasks."
+msgstr "Mostrar todas as tarefas."
+
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr "A resumir trabalho para esta tarefa."
+
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr "A suspender trabalho para esta tarefa."
+
+#: clientgui/WizardAttach.cpp:571
+msgid "Do you really want to cancel?"
+msgstr "Quer mesmo cancelar?"
+
+#: clientgui/WizardAttach.cpp:572
+msgid "Question"
+msgstr "Questão"
+
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "Pie Ctrl"
+
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
+msgid "Services"
+msgstr "Serviços"
+
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
+#, c-format
+msgid "Hide %s"
+msgstr "Ocultar %s"
+
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
+msgstr "Ocultar Outros"
+
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
+msgstr "Mostrar Todos"
+
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
+msgstr "Sair %s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr "Máscara"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr "Selecciona a aparência do interface de utilizador."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Vista Avançada...\tCtrl+Shift+A"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
+msgstr "Mostra o interface gráfico avançado."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr "Configurar opções de visualização e configurações de proxy"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr "Mostra as mensagens de diagnóstico."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
+msgstr "Predefinido"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
+msgstr "Suspende a Computação"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
+msgstr "Resume a Computação"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Abre uma janela para ver as notícias dos projectos ou do BOINC"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:360
+#, c-format
+msgid "Get help with %s"
+msgstr "Obter ajuda com o %s"
+
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Fechar"
+
+#: clientgui/sg_DlgMessages.cpp:394
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Notícias"
+
+#: clientgui/sg_DlgPreferences.cpp:206
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Para definições adicionais, seleccione Preferências de Computação na Vista Avançada"
+
+#: clientgui/sg_DlgPreferences.cpp:340
+msgid "GB of disk space"
+msgstr "Gb de espaço em disco"
+
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - Preferência de Computação"
+
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "Rejeitar todas as preferências locais e utilizar as preferências web?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Adicionar Projecto"
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "A cancelar a transferência..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Sincronizar"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "Tem a certeza que quer cancelar a transferência deste ficheiro '%s'?\nNOTA: Cancelar uma transferência invalidará a tarefa e\nnão receberá crédito pela mesma."
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Trabalho realizado para este projecto"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "Cancelar Transferência do Ficheiro"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "Voluntarie-se para um ou alguns dos mais de 30 projectos, em várias áreas da ciência"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "Upload"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Sincroniza os projectos com o gestor de conta"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-msgstr "Transferir"
+#. 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 "Seleccione o projecto para aceder com os controles em baixo"
 
-#: clientgui/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "tentar novamente em "
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Páginas Web do Projecto"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "falhou"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Comandos do Projecto"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "suspenso"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Abre um menu de websites para o projecto %s"
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
-msgstr "activo"
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Abre um menu de comandos para aplicar ao projecto %s"
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "pendente"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "Suspender esta tarefa."
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr " (projecto backoff: "
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Abandonar esta tarefa. Não obterá créditos por ela."
 
-#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-msgstr "Mostrar tarefas activas"
+#: clientgui/sg_TaskCommandPopup.cpp:267
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Tem a certeza que quer cancelar esta tarefa '%s'?\n(Progresso: %.1lf%%, Estado: %s)"
 
-#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "Mostrar apenas as tarefas activas."
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Não tem nenhuns projectos. Por favor adicione um Projecto."
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "Mostrar Consola VM"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "Indisponível"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "Mostrar Consola VM numa janela."
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "Tarefas:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-msgstr "Suspender trabalho para este resultado."
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
+msgstr "Seleccione uma tarefa para aceder"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Abandonar resultado do trabalho. Não receberá crédito por ele."
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "De:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "Restante (estimado)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "Progresso destas tarefas"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "Data Limite"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "Comandos das Tarefas"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "Tarefas"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Abrir um menu de comandos para aplicar a esta tarefa"
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "A resumir tarefa..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "Aplicação: %s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "A suspender tarefa..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "A mostrar gráficos para a tarefa..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "Aplicação: Indisponível"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "A mostrar Consola VM para a tarefa..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "Indisponível"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "Tem a certeza que quer cancelar esta tarefa '%s'?\n(Progresso: %s, Estado: %s)"
+msgid "Elapsed: %s"
+msgstr "Decorrido: %s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Tem a certeza que quer cancelar estas %d tarefas?"
+msgid "Remaining (estimated): %s"
+msgstr "Restante (estimado): %s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "A cancelar a tarefa..."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "Estado: %s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "Mostrar todas as tarefas"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "A rever o estado actual."
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "Mostrar todas as tarefas."
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "A realizar transferência de trabalho do servidor."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Adicionar projecto ou gestor de conta"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Processamento Suspenso:  A executar em Bateria."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Adicionar projecto ou utilizar um Gestor de Contas BOINC"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+msgstr "Processamento Suspenso:  Utilizador Activo."
 
-#: 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 "Se possível, adicione projectos no\nwebsite do %s.\n\nProjectos adicionados através do assistente não serão\nlistados ou geridos pelo %s."
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "Processamento Suspenso:  O utilizador parou o processamento."
 
-#: 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 "Existem mais de 30 projectos com base no BOINC\na realizar pesquisas em várias áreas da ciência,\ne você pode-se voluntariar para tantos quanto quiser.\nPode adicionar um projecto directamente,\nou usar o website de um 'Gestor de Conta' para seleccionar projectos."
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "Processamento Suspenso:  Hora do Dia."
 
-#: 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 "Escolheu adicionar um novo projecto de computação voluntária ou alterar os projectos\npara os quais contribui.\n\nAlguns destes projectos são executados e geridos pela World Community Grid, enquanto outros\nsão executados e geridos por outras equipas de pesquisa ou organizações. O software BOINC\npode dividir o seu poder de processamento livre, entre quaisquer combinações de projectos.\n\nAlternativamente, se fez o registo com um Gestor de Conta BOINC, pode utilizar\nisto para es [...]
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Processamento Suspenso:  A Executar Testes de Performance."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Usar um Gestor de Conta BOINC"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "Processamento Suspenso."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Adicionar ou alterar os seus projectos na World Community Grid"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "A aguardar contacto dos servidores do projecto."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Adicionar projectos executados por outros investigadores ou organizações"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "A rever estado actual"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "Quer mesmo cancelar?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "Sem trabalhos disponíveis para processar"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-msgstr "Questão"
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
+msgstr "Não foi possível ligar ao cliente de core"
 
 #: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
@@ -3829,32 +3868,7 @@ msgstr "< &Anterior"
 msgid "&Finish"
 msgstr "&Terminar"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Serviços"
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Ocultar %s"
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Ocultar Outros"
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Mostrar Todos"
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "Sair %s"
-
+#. /////////////////////////////////////////////////////////////////////////
 #: clientgui/DlgAdvPreferencesBase.h:45
 msgid "On this day of the week, compute only during these hours."
 msgstr "Neste dia da semana, realizar computação apenas durante estas horas."
diff --git a/locale/pt_PT/BOINC-Project-Generic.po b/locale/pt_PT/BOINC-Project-Generic.po
index 59d2c16..491f132 100644
--- a/locale/pt_PT/BOINC-Project-Generic.po
+++ b/locale/pt_PT/BOINC-Project-Generic.po
@@ -6,13 +6,14 @@
 # FileID  : $Id$
 # 
 # Translators:
+# Miguel Filipe Paulino de Sousa Veiga <Miguel.veig at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
-"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2015-02-09 00:18+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-05-05 11:43+0000\n"
+"Last-Translator: Miguel Filipe Paulino de Sousa Veiga <Miguel.veig at gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/boinc/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,6 +28,96 @@ msgstr "Português"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Portuguese"
 
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "Código de Convite"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "Um código de convite válido é necessário para criar uma conta."
+
+#: ../inc/account.inc:44 ../inc/host.inc:674 ../inc/result.inc:632
+#: ../inc/team.inc:219 ../inc/team.inc:367 ../inc/user.inc:198
+#: ../user/account_finish.php:41 ../user/team_admins.php:64
+#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:73
+#: ../user/top_users.php:49 ../user/user_search.php:124
+msgid "Name"
+msgstr "Nome"
+
+#: ../inc/account.inc:44 ../user/account_finish.php:41
+msgid "Identifies you on our web site. Use your real name or a nickname."
+msgstr "indentifica-o no seu website. Use o seu nome real ou um nome de utilizador."
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "Endereço de Email"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "Tem que ser um endereço válido do form 'name at domain'."
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "Palavra passe"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "Tem que ter pelo menos %1 caracteres"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "Confirme palavra passe"
+
+#: ../inc/account.inc:63 ../inc/team.inc:43 ../inc/team.inc:129
+#: ../inc/team.inc:242 ../inc/team.inc:382 ../inc/team.inc:470
+#: ../inc/user.inc:212 ../inc/user.inc:395 ../user/account_finish.php:45
+#: ../user/edit_user_info_form.php:38 ../user/profile_search_action.php:44
+#: ../user/team_email_list.php:73 ../user/team_search.php:85
+#: ../user/top_users.php:63 ../user/user_search.php:53
+#: ../user/user_search.php:125
+msgid "Country"
+msgstr "País"
+
+#: ../inc/account.inc:63 ../user/account_finish.php:45
+msgid "Select the country you want to represent, if any."
+msgstr "Seleccione o País que represente, se algum."
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "Código Postal"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "Opcional"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "Criar conta"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "Endereço de email:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "esqueceu-se do endereço de email?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "Palavra passe:"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "esqueceu-se da palavra passe?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "Manter-se logado"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "Entrar"
+
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
 msgstr "Texto em Negrito: [b]texto[/b]  (alt+b)"
@@ -40,323 +131,327 @@ msgid "Underline text: [u]text[/u]  (alt+u)"
 msgstr "Sublinhar texto: [u]text[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "Texto rasurado: [s]text[/s] (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "Citar texto: [quote]texto[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "Exibição do código: [code]código[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "Lista: [list]texto[/list] (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "Lista ordenada: [list=]texto[/list]  (alt+o)"
 
-#: ../inc/bbcode_html.inc:32
+#: ../inc/bbcode_html.inc:35
 msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
 msgstr "Inserir imagem: [img]http://image_url[/img]  (alt+p)"
 
-#: ../inc/bbcode_html.inc:35
+#: ../inc/bbcode_html.inc:38
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
 msgstr "Inserir URL: [url]http://url[/url] ou [url=http://url]URL texto[/url]  (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "Cor da fonte"
 
-#: ../inc/bbcode_html.inc:43
+#: ../inc/bbcode_html.inc:46
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
 msgstr "Cor da fonte: [color=red]texto[/color]  Dica: Pode tambem usar cor=#FF0000"
 
-#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
+#: ../inc/bbcode_html.inc:47 ../inc/bbcode_html.inc:62
+#: ../inc/prefs_util.inc:546
 msgid "Default"
 msgstr "Predefinido"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "Vermelho Escuro"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "Vermelho"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "Laranja"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "Castanho"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
 msgstr "Verde"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
 msgstr "Cor de azeitona"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
 msgstr "Ciano"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
 msgstr "Azul"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "Azul Escuro"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "Indigo"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
 msgstr "Violeta"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
 msgstr "Tamanho da fonte: [size=x-small]texto pequeno[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
 msgstr "Pequeno"
 
-#: ../inc/bbcode_html.inc:61
+#: ../inc/bbcode_html.inc:64
 msgid "Normal"
 msgstr "Normal"
 
-#: ../inc/bbcode_html.inc:62
+#: ../inc/bbcode_html.inc:65
 msgid "Large"
 msgstr "Grande"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close all open bbCode tags"
 msgstr "Fechar todas as tags bbCode abertas"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
 msgstr "Fechar Tags"
 
-#: ../inc/forum.inc:37
+#: ../inc/forum.inc:38
 msgid "Oldest first"
 msgstr "Os mais antigos primeiro"
 
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
 msgid "Newest first"
 msgstr "Os mais recentes primeiro"
 
-#: ../inc/forum.inc:39
+#: ../inc/forum.inc:40
 msgid "Highest rated posts first"
 msgstr "Posts melhor classificados primeiro"
 
-#: ../inc/forum.inc:41
+#: ../inc/forum.inc:42
 msgid "Newest post first"
 msgstr "Posts mais recentes primeiro"
 
-#: ../inc/forum.inc:42
+#: ../inc/forum.inc:43
 msgid "Most views first"
 msgstr "Mais vistos primeiro"
 
-#: ../inc/forum.inc:43
+#: ../inc/forum.inc:44
 msgid "Most posts first"
 msgstr "Mais posts primeiro"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search for words in forum messages"
 msgstr "Pesquisar por palavras em mensagens nos fóruns"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search forums"
 msgstr "Pesquisar fóruns"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:127
 msgid "Advanced search"
 msgstr "Pesquisa avançada"
 
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
-#: ../user/pm.php:133
+#: ../inc/forum.inc:133 ../inc/user.inc:325 ../user/pm.php:69
+#: ../user/pm.php:138
 msgid "Private messages"
 msgstr "Mensagens privadas"
 
-#: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
-#: ../user/forum_forum.php:71 ../user/sample_index.php:130
+#: ../inc/forum.inc:152 ../user/forum_forum.php:74
+#: ../user/sample_index.php:128
 msgid "Questions and Answers"
 msgstr "Perguntas e Respostas"
 
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250
-#: ../inc/user.inc:375 ../user/bs_sample_index.php:62
-#: ../user/forum_forum.php:73 ../user/sample_index.php:129
-#: ../project.sample/project.inc:43
+#: ../inc/forum.inc:152 ../inc/forum.inc:184 ../inc/user.inc:321
+#: ../inc/user.inc:454 ../user/forum_forum.php:76 ../user/sample_index.php:127
+#: ../project.sample/project.inc:70
 msgid "Message boards"
 msgstr "Mensagens do fórum"
 
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
 msgid "%1 message board"
 msgstr "%1 mensagem do fórum"
 
-#: ../inc/forum.inc:245 ../inc/result.inc:695
+#: ../inc/forum.inc:246 ../inc/result.inc:717
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../inc/forum.inc:283 ../inc/result.inc:704
+#: ../inc/forum.inc:284 ../inc/result.inc:726
 msgid "Next"
 msgstr "Próximo"
 
-#: ../inc/forum.inc:412 ../inc/forum.inc:1175 ../user/forum_forum.php:137
-#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
+#: ../inc/forum.inc:413 ../inc/forum.inc:1218 ../user/forum_forum.php:140
+#: ../user/forum_reply.php:126 ../user/forum_report_post.php:79
 msgid "Author"
 msgstr "Autor"
 
-#: ../inc/forum.inc:412 ../inc/pm.inc:86 ../user/forum_edit.php:128
-#: ../user/forum_edit.php:133 ../user/forum_post.php:116
-#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
-#: ../user/pm.php:90 ../user/pm.php:144
+#: ../inc/forum.inc:413 ../inc/pm.inc:86 ../user/forum_edit.php:128
+#: ../user/forum_edit.php:133 ../user/forum_post.php:120
+#: ../user/forum_reply.php:126 ../user/forum_report_post.php:79
+#: ../user/pm.php:90 ../user/pm.php:149
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
 msgstr "Enviar %1 uma mensagem privada"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
 msgstr "Juntou-se: %1"
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr "Posts: %1"
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
 msgstr "Crédito: %1"
 
-#: ../inc/forum.inc:597
+#: ../inc/forum.inc:600
 msgid "RAC: %1"
 msgstr "RAC: %1"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "You haven't read this message yet"
 msgstr "Ainda não leu esta mensagem"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "Não lidas"
 
-#: ../inc/forum.inc:623 ../inc/forum.inc:628 ../inc/forum.inc:727
+#: ../inc/forum.inc:627 ../inc/forum.inc:632 ../inc/forum.inc:731
 msgid "Message %1"
 msgstr "Mensagem %1"
 
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:628 ../inc/user.inc:409 ../user/forum_forum.php:178
 msgid "hidden"
 msgstr "oculto"
 
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
 msgstr "Postado: %1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:632
 msgid " - in response to "
 msgstr " - em resposta a"
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:635
 msgid "Edit"
 msgstr "Editar"
 
-#: ../inc/forum.inc:631
+#: ../inc/forum.inc:635
 msgid "Edit this message"
 msgstr "Edite esta mensagem"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
 msgstr "Modificadas em último: %1"
 
-#: ../inc/forum.inc:640
+#: ../inc/forum.inc:644
 msgid ""
 "This post is not shown because the sender is on your 'ignore' list.  Click "
 "%1here%2 to view this post"
 msgstr "Este post não é mostrado porque o remetente está na sua lista de pessoas' ignoradas'. Carregue %1aqui%2 para ver este post"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
 msgstr "Reportar este post como ofensivo"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
 msgstr "Reportar como ofensivo"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
 msgstr "Classificação: %1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
 msgstr "classificar:"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
 msgstr "Carregue aqui se gosta da mensagem"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
 msgstr "Classifique +"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
 msgstr "Carregue aqui se não gosta desta mensagem"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
 msgstr "Classifique -"
 
-#: ../inc/forum.inc:685 ../user/pm.php:106 ../user/pm.php:146
+#: ../inc/forum.inc:689 ../user/pm.php:111 ../user/pm.php:151
 msgid "Reply"
 msgstr "Responder"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:689
 msgid "Post a reply to this message"
 msgstr "Poste uma resposta a esta mensagem"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Quote"
 msgstr "Citar"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
 msgstr "Poste uma resposta citando esta mensagem"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
 msgstr "Oculto pelo moderador"
 
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
 msgstr "Postado %1 por %2"
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
 msgstr "Não pode postar ou classificar mensagens ate %1"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -374,343 +469,350 @@ msgid ""
 "        "
 msgstr "\n        <ul>\n        <li> Os posts têm de ser 'amigáveis': não poderão conter\n              conteúdo que seja obsceno, conteúdo sexual\n              explícito ou sugestivo.\n        <li> Publicidade.\n        <li> Links para websites envolvendo conteúdo sexual,\n             jogos de azar, ou intolerâncias de outros tipos.\n         <li> Mensagens destinadas a importunar ou antoganizar outras pessoas,\n              ou para sequestrar um tópico.\n         <li> Mensagens que  [...]
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
 msgstr "Regras:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:785
 msgid "More info"
 msgstr "Mais informação"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
 msgid "Unhide"
 msgstr "Revelar"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
 msgstr "Revelar este tópico"
 
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
+#: ../inc/forum.inc:1084 ../user/forum_thread.php:196
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../inc/forum.inc:1057
+#: ../inc/forum.inc:1084
 msgid "Hide this post"
 msgstr "Ocultar este post"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
 msgid "Move"
 msgstr "Mover"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
 msgstr "Mover post para um tópico diferente"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1094
 msgid "Banish author"
 msgstr "Banir autor"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
 msgstr "Votar para banir autor"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
 msgstr "Votar para não banir autor"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
 msgstr "Iniciar votação para banir autor"
 
-#: ../inc/forum.inc:1116
+#: ../inc/forum.inc:1115 ../inc/user.inc:312 ../user/forum_thread.php:243
+#: ../user/pm.php:112 ../user/pm.php:152
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "Apagar este post"
+
+#: ../inc/forum.inc:1153
 msgid "Only team members can post to the team message board"
 msgstr "Apenas membros da equipa podem postar no fórum da equipa"
 
-#: ../inc/forum.inc:1126
+#: ../inc/forum.inc:1163
 msgid ""
 "In order to create a new thread in %1 you must have a certain amount of "
 "credit. This is to prevent and protect against abuse of the system."
 msgstr "Em ordem para criar um novo tópico no %1 tem que ter um certo número de créditos. Isto previne e protege contra abusos do sistema."
 
-#: ../inc/forum.inc:1133
+#: ../inc/forum.inc:1170
 msgid ""
 "You cannot create any more threads right now. Please wait a while before "
 "trying again. This delay has been enforced to protect against abuse of the "
 "system."
 msgstr "Não pode criar mais tópicos de momento. Por favor, aguarde um momento antes de tentar novamente. Este atraso foi forçado para protecção de abusos do sistema."
 
-#: ../inc/forum.inc:1140
+#: ../inc/forum.inc:1177
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
 msgstr "Este tópico está bloqueado. Apenas moderadores do fórum e administradores podem postar aqui."
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
 msgstr "Não pode postar num tópico oculto."
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "Tópico"
 
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
-#: ../user/forum_index.php:94
+#: ../inc/forum.inc:1217 ../inc/team.inc:135 ../user/forum_forum.php:139
+#: ../user/forum_index.php:99
 msgid "Posts"
 msgstr "Posts"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1219 ../user/forum_forum.php:141
 msgid "Views"
 msgstr "Vistas"
 
-#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
-#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
+#: ../inc/forum.inc:1220 ../inc/team.inc:135 ../user/forum_forum.php:142
+#: ../user/forum_help_desk.php:48 ../user/forum_index.php:100
 msgid "Last post"
 msgstr "Último post"
 
-#: ../inc/forum.inc:1235
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
 msgstr "Novos posts no tópico %1"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
 msgstr "Novos posts no tópico subscrito"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
 msgstr "Existem novos posts no tópico '%1'"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "Marcar todos os tópicos como lidos"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
 msgstr "Marcar todos os tópicos em todas as mensagens do fórum como lidas."
 
-#: ../inc/host.inc:24
+#: ../inc/host.inc:25
 msgid "No host"
 msgstr "Sem anfitrião"
 
-#: ../inc/host.inc:26
+#: ../inc/host.inc:27
 msgid "Unavailable"
 msgstr "Indisponível"
 
-#: ../inc/host.inc:56 ../inc/prefs.inc:639 ../inc/prefs.inc:1048
+#: ../inc/host.inc:56 ../inc/prefs.inc:665 ../inc/prefs_util.inc:547
 msgid "Home"
 msgstr "Casa"
 
-#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
+#: ../inc/host.inc:57 ../inc/prefs.inc:666 ../inc/prefs_util.inc:549
+#: ../user/server_status.php:138
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../inc/host.inc:58 ../inc/prefs.inc:640 ../inc/prefs.inc:1050
+#: ../inc/host.inc:58 ../inc/prefs.inc:667 ../inc/prefs_util.inc:548
 msgid "School"
 msgstr "Escola"
 
-#: ../inc/host.inc:59
-msgid "Mobile"
-msgstr "Móvel"
-
-#: ../inc/host.inc:61 ../user/edit_forum_preferences_form.php:172
-#: ../user/edit_forum_preferences_form.php:173
+#: ../inc/host.inc:60 ../user/edit_forum_preferences_form.php:161
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../inc/host.inc:85
+#: ../inc/host.inc:84
 msgid "Computer information"
 msgstr "Informações Computador"
 
-#: ../inc/host.inc:89 ../inc/host.inc:94
+#: ../inc/host.inc:88 ../inc/host.inc:93
 msgid "IP address"
 msgstr "Endereço IP"
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr "(o mesmo que das útimas %1 vezes)"
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr "Endereço de IP externo"
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr "Mostrar endereço IP"
 
-#: ../inc/host.inc:96
+#: ../inc/host.inc:95
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: ../inc/host.inc:98
+#: ../inc/host.inc:97
 msgid "Product name"
 msgstr "Nome do producto"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "Local Standard Time"
 msgstr "Hora Local"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "UTC %1 hours"
 msgstr "UTC %1 horas"
 
-#: ../inc/host.inc:106 ../inc/host.inc:108 ../inc/host.inc:222
+#: ../inc/host.inc:105 ../inc/host.inc:107 ../inc/host.inc:222
 msgid "Owner"
 msgstr "Proprietário"
 
-#: ../inc/host.inc:108 ../inc/host.inc:355
+#: ../inc/host.inc:107 ../inc/host.inc:360
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../inc/host.inc:112 ../inc/result.inc:630
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
 msgid "Created"
 msgstr "Criado"
 
-#: ../inc/host.inc:113 ../inc/host.inc:226 ../inc/host.inc:231
-#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:215
-#: ../inc/team.inc:220 ../inc/team.inc:222 ../inc/team.inc:364
-#: ../inc/team.inc:369 ../inc/user.inc:125 ../inc/user.inc:138
-#: ../user/profile_search_action.php:43
-#: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64
-#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
-#: ../user/top_users.php:59 ../user/user_search.php:140
+#: ../inc/host.inc:112 ../inc/host.inc:226 ../inc/host.inc:231
+#: ../inc/host.inc:686 ../inc/team.inc:105 ../inc/team.inc:224
+#: ../inc/team.inc:229 ../inc/team.inc:231 ../inc/team.inc:373
+#: ../inc/team.inc:378 ../inc/user.inc:126 ../inc/user.inc:139
+#: ../user/profile_search_action.php:45
+#: ../user/team_change_founder_form.php:80 ../user/team_email_list.php:73
+#: ../user/team_remove_inactive_form.php:43 ../user/top_users.php:54
+#: ../user/top_users.php:59 ../user/user_search.php:125
 msgid "Total credit"
 msgstr "Créditos totais"
 
-#: ../inc/host.inc:114 ../inc/user.inc:125 ../user/team_search.php:70
-#: ../user/user_search.php:139
+#: ../inc/host.inc:113 ../inc/user.inc:126 ../user/team_search.php:83
+#: ../user/user_search.php:124
 msgid "Average credit"
 msgstr "Média de créditos"
 
-#: ../inc/host.inc:116
+#: ../inc/host.inc:115
 msgid "Cross project credit"
 msgstr "Cruzar créditos do projecto"
 
-#: ../inc/host.inc:118
+#: ../inc/host.inc:117
 msgid "CPU type"
 msgstr "Tipo de CPU"
 
-#: ../inc/host.inc:119
+#: ../inc/host.inc:118
 msgid "Number of processors"
 msgstr "Número de processadores"
 
-#: ../inc/host.inc:121
+#: ../inc/host.inc:120
 msgid "Coprocessors"
 msgstr "Co-processadores"
 
-#: ../inc/host.inc:123 ../inc/host.inc:687
+#: ../inc/host.inc:122 ../inc/host.inc:692
 msgid "Operating System"
 msgstr "Sistema Operativo"
 
-#: ../inc/host.inc:126 ../inc/host.inc:235
+#: ../inc/host.inc:125 ../inc/host.inc:235
 msgid "BOINC version"
 msgstr "Versão do BOINC"
 
-#: ../inc/host.inc:130
+#: ../inc/host.inc:129 ../inc/prefs.inc:237
 msgid "Memory"
 msgstr "Memória"
 
-#: ../inc/host.inc:130 ../inc/host.inc:140
+#: ../inc/host.inc:129 ../inc/host.inc:139
 msgid "%1 MB"
 msgstr "%1 MB"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "Cache"
 msgstr "Cache"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "%1 KB"
 msgstr "%1 KB"
 
-#: ../inc/host.inc:140
+#: ../inc/host.inc:139
 msgid "Swap space"
 msgstr "Espaço temporário"
 
-#: ../inc/host.inc:143
+#: ../inc/host.inc:142
 msgid "Total disk space"
 msgstr "Espaço total em disco"
 
-#: ../inc/host.inc:143 ../inc/host.inc:146
+#: ../inc/host.inc:142 ../inc/host.inc:145
 msgid "%1 GB"
 msgstr "%1 GB"
 
-#: ../inc/host.inc:146
+#: ../inc/host.inc:145
 msgid "Free Disk Space"
 msgstr "Espaço Livre em Disco"
 
-#: ../inc/host.inc:150
+#: ../inc/host.inc:149
 msgid "Measured floating point speed"
 msgstr "FLOP calculado"
 
-#: ../inc/host.inc:150 ../inc/host.inc:153
+#: ../inc/host.inc:149 ../inc/host.inc:152
 msgid "%1 million ops/sec"
 msgstr "%1 milhão ops/seg"
 
-#: ../inc/host.inc:153
+#: ../inc/host.inc:152
 msgid "Measured integer speed"
 msgstr "Velocidade calculada de inteiros"
 
-#: ../inc/host.inc:157 ../inc/host.inc:159
+#: ../inc/host.inc:156 ../inc/host.inc:158
 msgid "Average upload rate"
 msgstr "Taxa média de upload"
 
-#: ../inc/host.inc:157 ../inc/host.inc:164
+#: ../inc/host.inc:156 ../inc/host.inc:163
 msgid "%1 KB/sec"
 msgstr "%1 KB/seg"
 
-#: ../inc/host.inc:159 ../inc/host.inc:166 ../inc/result.inc:216
+#: ../inc/host.inc:158 ../inc/host.inc:165 ../inc/result.inc:216
 #: ../inc/result.inc:226 ../inc/result.inc:244 ../inc/result.inc:262
 #: ../inc/result.inc:278 ../user/explain_state.php:56
 #: ../user/host_app_versions.php:30
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../inc/host.inc:164 ../inc/host.inc:166
+#: ../inc/host.inc:163 ../inc/host.inc:165
 msgid "Average download rate"
 msgstr "Taxa média de transferência"
 
-#: ../inc/host.inc:169 ../user/host_app_versions.php:65
+#: ../inc/host.inc:168 ../user/host_app_versions.php:65
 msgid "Average turnaround time"
 msgstr "Tempo de resposta médio"
 
-#: ../inc/host.inc:169 ../user/forum_search.php:46 ../user/forum_search.php:47
-#: ../user/forum_search.php:48 ../user/forum_search.php:49
+#: ../inc/host.inc:168 ../user/forum_search.php:48 ../user/forum_search.php:49
+#: ../user/forum_search.php:50 ../user/forum_search.php:51
 msgid "%1 days"
 msgstr "%1 dias"
 
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
 msgstr "Detalhes da aplicação"
 
-#: ../inc/host.inc:171
+#: ../inc/host.inc:170
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../inc/host.inc:181 ../inc/host.inc:336 ../inc/user.inc:152
+#: ../inc/host.inc:180 ../inc/host.inc:341 ../inc/user.inc:155
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../inc/host.inc:185 ../inc/host.inc:206
+#: ../inc/host.inc:184 ../inc/host.inc:206
 msgid "Number of times client has contacted server"
 msgstr "Número de vezes que o cliente contactou o servidor"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
 msgstr "A última vez que o servidor foi contactado"
 
-#: ../inc/host.inc:187
-#, php-format
-msgid "% of time BOINC is running"
-msgstr "% de tempo que o BOINC está em execução"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
+msgstr "Fracção de tempo do BOINC está em execução"
 
-#: ../inc/host.inc:189
-#, php-format
-msgid "While BOINC running, % of time host has an Internet connection"
-msgstr "Enquanto o BOINC está em execução, % de tempo que o computador anfitrião tem conexão à Internet"
+#: ../inc/host.inc:188
+msgid ""
+"While BOINC is running, fraction of time computer has an Internet connection"
+msgstr "Enquanto o BOINC estiver em execução, uma fracção de tempo usa ligação à Internet"
+
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
+msgstr "Enquanto o BOINC estiver em execução, uma fracção de tempo de computação é permitida"
 
 #: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
-msgstr "Enquanto o BOINC está em execução, % de tempo de trabalho permitido"
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "Enquanto o BOINC estiver em execução, uma fracção de tempo de computação da GPU é permitida"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -720,7 +822,7 @@ msgstr "Eficiência média do CPU"
 msgid "Task duration correction factor"
 msgstr "Duração do factor de correcção da tarefa"
 
-#: ../inc/host.inc:198 ../inc/host.inc:674
+#: ../inc/host.inc:198 ../inc/host.inc:679
 msgid "Location"
 msgstr "Localização"
 
@@ -736,7 +838,7 @@ msgstr "Fundir registos duplicados deste computador"
 msgid "Merge"
 msgstr "Fundir"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
 msgstr "Último contacto"
 
@@ -744,30 +846,30 @@ msgstr "Último contacto"
 msgid "Computer info"
 msgstr "Informações do computador"
 
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
+#: ../inc/host.inc:221 ../inc/host.inc:681 ../inc/team.inc:366
 #: ../user/top_users.php:48
 msgid "Rank"
 msgstr "Classificação"
 
-#: ../inc/host.inc:225 ../inc/host.inc:679
+#: ../inc/host.inc:225 ../inc/host.inc:684
 msgid "Avg. credit"
 msgstr "Média de créditos"
 
-#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
-#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
-#: ../inc/team.inc:368 ../inc/user.inc:139
-#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:64
-#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
+#: ../inc/host.inc:230 ../inc/team.inc:106 ../inc/team.inc:225
+#: ../inc/team.inc:234 ../inc/team.inc:236 ../inc/team.inc:372
+#: ../inc/team.inc:377 ../inc/user.inc:140
+#: ../user/team_change_founder_form.php:81 ../user/team_email_list.php:73
+#: ../user/team_remove_inactive_form.php:44 ../user/top_users.php:53
 #: ../user/top_users.php:58
 msgid "Recent average credit"
 msgstr "Média de créditos recentes"
 
-#: ../inc/host.inc:236 ../inc/host.inc:684 ../inc/result.inc:51
+#: ../inc/host.inc:236 ../inc/host.inc:689 ../inc/result.inc:51
 #: ../user/host_app_versions.php:25
 msgid "CPU"
 msgstr "CPU"
 
-#: ../inc/host.inc:237 ../inc/host.inc:685
+#: ../inc/host.inc:237 ../inc/host.inc:690
 msgid "GPU"
 msgstr "GPU"
 
@@ -775,91 +877,83 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "Sistema operativo"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr "(%1 processadores)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
 msgstr "Cruzar estatísticas do projecto:"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
 msgstr "O anfitrião %1 tem uma sobreposição do tempo de vida:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr "O anfitrião %1 tem um Sistema Operativo incompatível:"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr "O anfitrião %1 tem um CPU incompatível:"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
 msgstr "o mesmo anfitrião"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
 msgstr "Não é possivel fundir o anfitrião %1 ao %2 - são incompatíveis"
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr "A fundir anfitrião %1 ao anfitrião %2"
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
 msgstr "Não foi possível actualizar os créditos do novo computador"
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
 msgstr "Não foi possível actualizar os resultados"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
 msgstr "Não foi possivel retirar o computador antigo"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
 msgstr "Computador antigo retirado %1"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "Mostrar:"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
 msgstr "Todos os computadores"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Only computers active in past 30 days"
 msgstr "Apenas os computadores activos nos últimos 30 dias"
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr "ID do computador"
 
-#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:210
-#: ../inc/team.inc:358 ../inc/user.inc:199 ../user/account_finish.php:41
-#: ../user/create_account_form.php:79 ../user/team_admins.php:62
-#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
-#: ../user/top_users.php:49 ../user/user_search.php:139
-msgid "Name"
-msgstr "Nome"
-
-#: ../inc/host.inc:682
+#: ../inc/host.inc:687
 msgid "BOINC<br>version"
 msgstr "Versão<br>BOINC"
 
-#: ../inc/host.inc:745 ../user/merge_by_name.php:65
+#: ../inc/host.inc:750 ../user/merge_by_name.php:65
 msgid "Merge computers by name"
 msgstr "Fundir computadores por nome"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
 msgstr "Navegador predefinido"
 
@@ -872,29 +966,29 @@ msgstr "Comentar"
 msgid "News is available as an %sRSS feed%s"
 msgstr "Novidades estão disponíveis como %sFeed RSS%s"
 
-#: ../inc/pm.inc:25 ../inc/pm.inc:174 ../user/pm.php:69 ../user/pm.php:148
+#: ../inc/pm.inc:25 ../inc/pm.inc:176 ../user/pm.php:69 ../user/pm.php:153
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
 msgid "Write"
 msgstr "Escrever"
 
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:458
 msgid "Send private message"
 msgstr "Mandar mensagem privada"
 
 #: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
 #: ../user/ffmail_form.php:58 ../user/forum_edit.php:99
 #: ../user/forum_edit.php:101 ../user/forum_edit.php:145
-#: ../user/forum_post.php:61 ../user/forum_post.php:87
-#: ../user/forum_post.php:89 ../user/forum_post.php:130
-#: ../user/forum_reply.php:74 ../user/forum_reply.php:107
-#: ../user/forum_reply.php:109 ../user/forum_reply.php:165 ../user/pm.php:181
+#: ../user/forum_post.php:65 ../user/forum_post.php:91
+#: ../user/forum_post.php:93 ../user/forum_post.php:134
+#: ../user/forum_reply.php:77 ../user/forum_reply.php:110
+#: ../user/forum_reply.php:115 ../user/forum_reply.php:171 ../user/pm.php:186
 msgid "Preview"
 msgstr "Pré-visualizar"
 
-#: ../inc/pm.inc:48 ../user/pm.php:131
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
 msgstr "não existe essa mensagem"
 
@@ -906,7 +1000,7 @@ msgstr "Para"
 msgid "User IDs or unique usernames, separated with commas"
 msgstr "IDs dos utilizadores ou nomes de utilizador únicos, separados com virgulas"
 
-#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:139
+#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:144
 msgid "Subject"
 msgstr "Assunto"
 
@@ -914,376 +1008,499 @@ msgstr "Assunto"
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
 msgstr "enviou-lhe uma mensagem privada; assunto:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
 msgstr "Mensagem privada%1 de %2, assunto:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
 msgstr "Não foi possível criar mensagem"
 
-#: ../inc/pm.inc:166
+#: ../inc/pm.inc:168
 msgid ""
 "You are not allowed to send privates messages so often. Please wait some "
 "time before sending more messages."
 msgstr "Não está autorizado a enviar mensagens privadas tão frequentemente. Por favor, aguarde algum tempo antes de enviar mais mensagens."
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "não lidas"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
 msgstr "Para notificações de email, %1edite as preferências da comunidade%2"
 
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "Mensagem privada"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "Limites de utilização"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "Usar no máximo"
+
+#: ../inc/prefs.inc:49
+#, no-php-format
+msgid ""
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
+msgstr "Manter alguns CPUs livres para outras aplicações. Exemplo: 75% significa utilizar 6 cores num CPU de 8 cores."
+
+#: ../inc/prefs.inc:52
+#, no-php-format
+msgid "% of the CPUs"
+msgstr "% dos CPUs"
+
+#: ../inc/prefs.inc:57
+#, no-php-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."
+msgstr "Suspende/resume computação em alguns segundos para reduzir a temperatura do CPU e o consumo de energia. Exemplo: 75% significa realizar computação durante 3 segundos, aguardar 1 segundo e repetir."
+
+#: ../inc/prefs.inc:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% de tempo de CPU"
+
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "Quando suspender"
+
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "Suspender quando o computador estiver apenas com bateria"
+
+#: ../inc/prefs.inc:65
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr "Suspender trabalho quando o computador está ligado apenas à bateria? %1 Só relevante para portáteis %2"
+"Check this to suspend computing on portables when running on battery power."
+msgstr "Seleccione aqui para suspender a computação em portáteis quando estiverem apenas com alimentação da bateria."
 
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
-msgstr "Suspender trabalho quando o computador estiver em utilização?"
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "Suspender quando o computador estiver em utilização"
 
-#: ../inc/prefs.inc:91
+#: ../inc/prefs.inc:71
 msgid ""
-"Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr "Suspender trabalho da GPU quando o computador estiver em utilização? %1 Forçado pela versão 6.6.21+ %2"
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "Seleccione aqui para suspender a computação e transferência de ficheiros quando estiver a utilizar o computador."
+
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "Suspender a GPU enquanto o computador está em utilização"
+
+#: ../inc/prefs.inc:77
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "Seleccione aqui para suspender a computação com a GPU quanto estiver a utilizar o computador."
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
 msgstr "'Em utilização' significa actividade do rato/teclado nos últimos"
 
-#: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
+#: ../inc/prefs.inc:83
+msgid "This determines when the computer is considered 'in use'."
+msgstr "Isto determina quando o computador é considerado 'em utilização'."
+
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
 msgid "minutes"
 msgstr "minutos"
 
-#: ../inc/prefs.inc:105
-msgid ""
-"Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
-"power mode on some computers %2"
-msgstr "Suspender trabalho se não houver actividade do rato/teclado nos últimos %1 Necessário definir baixo consumo em alguns computadores %2"
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "Suspender quando não houver actividade do rato/teclado nos últimos"
 
-#: ../inc/prefs.inc:114
-msgid ""
-"Suspend work when non-BOINC CPU usage is above %1 0 means no "
-"restriction<br>Enforced by version 6.10.30+ %2"
-msgstr "Suspender trabalho se o uso do CPU que não o do BOINC for abaixo de %1 0 significa sem restrições<br>Forçado pela versão 6.10.30+ %2"
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "Isto permite que alguns computadores entrem em poupança de energia quando não estiverem a ser utilizados."
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr "Executar trabalho apenas entre as horas de %1 Sem restrições se igual a %2"
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Suspender quando a utilização do CPU por parte de terceiros for superior a"
 
-#: ../inc/prefs.inc:130
-msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr "Deixar tarefas em memória enquanto suspensas? %1 Suspender tarefas irá consumir espaço swap se 'sim' %2"
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "Suspender computação quando o computador estiver ocupado a executar outros programas."
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "Alternar tarefas a cada %1 Recomendado: 60 minutos %2"
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "Realizar computação apenas entre"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "Em multiprocessadores, usar no máximo"
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "Executar computação apenas durante um período específico do dia."
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "processadores"
+#: ../inc/prefs.inc:105 ../inc/prefs.inc:214
+#: ../user/forum_banishment_vote.php:70
+#: ../user/forum_banishment_vote_action.php:65
+#: ../user/forum_moderate_post.php:63 ../user/forum_moderate_thread.php:61
+msgid "Other"
+msgstr "Outro"
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr "Em multiprocessadores, usar no máximo %1 Forçado pela versão 6.1+ %2"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "Armazenar no minímo"
 
-#: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr "% dos processadores"
+#: ../inc/prefs.inc:108
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "Armazenar tarefas suficientes, no mínimo para manter o computador ocupado por este período."
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr "Usar no máximo %1  Pode ser usado para reduzir aquecimento do CPU %2"
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "dias de trabalho"
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr "% de tempo de CPU"
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "Armazene até um adicional"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "Disco: usar no máximo"
+#: ../inc/prefs.inc:114
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "Armazene tarefas adicionais acima do nível mínimo. Determina a quantidade de trabalho que é pedido quando um projecto é contactado."
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "GB"
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+msgstr "Trocar entre tarefas a cada"
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr "Disco: deixar livre pelo menos %1 Valores mais pequenos que %2  são ignorados %3"
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "Se executa vários projectos, o BOINC pode trocar entre eles com esta regularidade."
 
-#: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
-#: ../inc/prefs.inc:211
-#, php-format
-msgid "% of total"
-msgstr "% do total "
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "Solicitar que as tarefas criem um checkpoint no máximo a cada "
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "Checkpoint das tarefas em disco no máximo a cada"
+#: ../inc/prefs.inc:126
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "Isto controla com que frequência as tarefas guardam no disco o seu estado, para que possam ser reiniciadas mais tarde."
 
-#: ../inc/prefs.inc:196
+#: ../inc/prefs.inc:128
 msgid "seconds"
 msgstr "segundos"
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "Espaço temporário : usar no máximo"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "Utilizar não mais do que"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "Memória: quando o computador está em utilização, usar no máximo"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "Limita o espaço total em disco utilizado pelo BOINC."
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "Memória: quando o computador não está em utilização, usar no máximo"
+#: ../inc/prefs.inc:139
+msgid "GB"
+msgstr "GB"
 
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr "Manter tarefas suficiente para manter ocupado pelo menos%1(máx10 dias).%2"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "Deixar pelo menos"
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr "dias"
+#: ../inc/prefs.inc:143
+msgid ""
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "Limita a utilização em disco de modo a deixar esta quantidade de espaço livre no volume onde o BOINC armazena os dados."
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... e um adicional"
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB livres"
 
-#: ../inc/prefs.inc:232
+#: ../inc/prefs.inc:149
 msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr "Confirmar antes de se conectar à Internet? %1 Só relevante se tiver um modem, ISDN ou uma conexão VPN %2"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "Limita a percentagem de disco utilizada pelo BOINC no volume onde os dados são armazenados."
 
-#: ../inc/prefs.inc:241
-msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr "Desligar quando completo? %1 Só relevante se tiver um modem, ISDN ou uma conecção VPN %2"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "% do total "
 
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "Taxa máxima de transferência:"
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "Quando o computador está em utilização, usar no máximo"
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr "Kbytes/seg"
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "Limita a memória usada pelo BOINC quando está a utilizar o computador. "
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "Taxa máxima de upload:"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr "Usar a rede apenas entre as horas"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "Quando o computador não está em utilização, usar no máximo"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "Transferir no máximo a %1 Forçado pela versão 6.10.46+ %2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "Limita a memória usada pelo BOINC quando não está a utilizar o computador."
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "Mbytes a cada"
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "Deixar tarefas não-GPU em memória enquanto estiverem suspensas"
 
-#: ../inc/prefs.inc:274
+#: ../inc/prefs.inc:173
 msgid ""
-"Skip image file verification? %1 Check this ONLY if your Internet provider "
-"modifies image files (UMTS does this, for example). %2 Skipping verification"
-" reduces the security of BOINC. %3"
-msgstr "Saltar verificação da imagem do ficheiro? %1 Assinale esta opção APENAS se o seu fornecedor de Internet modifica o ficheiro da imagem (o UMTS faz isto, por exemplo). %2 Saltar a verificação reduz a segurança do BOINC. %3"
+"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 "Se marcado, as tarefas suspensas ficam em memória e, retomam sem trabalho perdido. Se não estiver marcado, as tarefas suspensas são removidas da memória e, retoma a partir do seu último checkpoint."
 
-#: ../inc/prefs.inc:287
-msgid ""
-"Resource share %1 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. %2"
-msgstr "Partilha de recursos %1 Determina a proporção dos recursos do seu computador dedicados a este projecto. Exemplo: se participa em dois projectos BOINC com recursos partilhados de 100 e 200, o primeiro obterá 1/3 dos recursos e o segundo obterá 2/3. %2"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "Página/ficheiro swap: usar no máximo"
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr "Acelerar tarefas de GPU dedicando um CPU a cada uma?"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "Limita o espaço swap (ficheiro de paginação) utilizado pelo BOINC."
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "Usar CPU %1 Forçado pela versão da 6.10+ %2"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "Limitar taxa de transferência a"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "Usar GPU ATI %1 Forçado pela versão 6.10+ %2"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "Limita a taxa de transferência de ficheiros."
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "Usar GPU NVIDIA %1 Forçado pela versão 6.10+ %2"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "KB/segundo"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "Usar GPU Intel %1 Forçado pela versão 7.2+ %s"
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr "Limitar a taxa de upload a"
 
-#: ../inc/prefs.inc:358
-msgid ""
-"Run test applications? %1 This helps us develop applications, but may cause "
-"jobs to fail on your computer %2"
-msgstr "Executar aplicações de teste? %1 Isto irá nos ajudar a desenvolver aplicações, mas pode provocar que os trabalhos falhem no seu computador %2"
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "Limita a taxa de upload de transferência de ficheiros."
 
-#: ../inc/prefs.inc:367
-msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this "
-"address."
-msgstr "Emails serão enviados de %1; confirme que o seu filtro de spam aceita este endereço."
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "Limitar utilização a"
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "OK para %1 e a sua equipa (se alguma) lhe enviarem e-mails?"
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "Exemplo: O BOINC deve transferir no máximo 2000 MB de dados a cada 30 dias."
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "Deve o %1 mostrar os seus computadores no seu website?"
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "MB a cada"
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "Disco e utilização de memória"
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
+msgid "days"
+msgstr "dias"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "Utilização do processador"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "Transferir ficheiros apenas entre"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "Utilização de rede"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "Transferir ficheiros apenas durante um período específico do dia."
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr "Estas preferências aplicam-se a todos os projectos BOINC em que participa."
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "Saltar verificação de dados para imagens"
 
-#: ../inc/prefs.inc:395
+#: ../inc/prefs.inc:217
 msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of"
-" range or not numeric."
-msgstr "%1Não foi possível actualizar as preferências.%2 Os valores marcados abaixo a vermelho ficaram fora de alcance ou não são numéricos."
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "Seleccione aqui apenas se o seu fornecedor de Internet modifica os ficheiros de imagem. Saltar a verificação reduz a segurança do BOINC."
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "mau conjunto: %1"
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "Confirmar antes de se conectar à Internet"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "mau subconjunto: %1"
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "Útil apenas se tiver um modem, ISDN ou conexão VPN."
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1025
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:85
-msgid "yes"
-msgstr "sim"
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "Disconectar quando terminado"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1027
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:87
-msgid "no"
-msgstr "não"
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
+msgid "Computing"
+msgstr "A computar"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "sem limite"
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "Disco"
 
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-msgstr "Adicionar"
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "Rede"
 
-#: ../inc/prefs.inc:706 ../inc/prefs.inc:834
-#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34
-msgid "Remove"
-msgstr "Remover"
+#: ../inc/prefs.inc:241
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "Estas preferências aplicam-se a todos os projectos BOINC em que participa."
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
-msgid "Computing"
-msgstr "A computar"
+#: ../inc/prefs.inc:244
+msgid ""
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1Não foi possível actualizar as preferências.%2 Os valores marcados abaixo a vermelho ficaram fora de alcance ou não são numéricos."
 
-#: ../inc/prefs.inc:823
+#: ../inc/prefs.inc:483
 msgid "Separate preferences for %1"
 msgstr "Separar preferências para %1"
 
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
+#: ../inc/prefs.inc:493 ../inc/prefs.inc:528 ../inc/prefs_project.inc:291
 msgid "Edit preferences"
 msgstr "Editar preferências"
 
-#: ../inc/prefs.inc:839
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "Remover"
+
+#: ../inc/prefs.inc:499
 msgid "Add separate preferences for %1"
 msgstr "Adicionar preferências separadas para %1"
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
-msgstr "(Mudar Vista)"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "Estas configurações aplicam-se a todos os computadores a usarem esta conta, excepto"
+
+#: ../inc/prefs.inc:508
+msgid ""
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "computadores onde definiu as preferências locais para utilizarem o Gestor BOINC"
+
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Dispositivos Android"
+
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
+msgstr "(Mudar de vista)"
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
 msgid "Combined preferences"
 msgstr "Preferências combinadas"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr "Definições específicas do projecto"
-
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
 msgid "Primary (default) preferences"
 msgstr "Preferências primárias (predefinição)"
 
-#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
-#: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64
-#: ../user/prefs_edit.php:92
-msgid "Edit %1 preferences"
-msgstr "Editar preferências %1"
+#: ../inc/prefs.inc:537
+msgid "Preferences last modified:"
+msgstr "Preferências modificadas por último:"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr "Estas aplicam-se a todos os projectos BOINC em que participa."
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
+msgstr "Adicionar preferências"
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
+msgstr "Actualizar preferências"
+
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "sim"
+
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
+msgstr "não"
+
+#: ../inc/prefs.inc:638
+msgid "Default computer location"
+msgstr "Localização do computador por predefinição"
+
+#: ../inc/prefs.inc:639
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr "Em computadores que participem em múltiplos projectos, as preferências utilizadas serão as mais recentes."
+"New computers will use this location for computing and project preferences."
+msgstr "Novos computadores irão utilizar esta localização para computação e preferências de projecto."
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr "Estas preferências não se aplicam a dispositivos Android."
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "Quota de recursos"
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr "Preferências modificadas por último:"
+#: ../inc/prefs_project.inc:53
+msgid ""
+"Determines the proportion of your computer's resources allocated to this "
+"project. For 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 "Determina a proporção de recursos alocados no seu computador para este projecto. Por exemplo, se participa em dois projectos BOINC, com partilha de recursos de 100 e 200, o primeiro irá ficar com 1/3 dos recursos e o segundo com 2/3."
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr "Adicionar preferências"
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "Acelerar tarefas de GPU dedicando um CPU a cada uma?"
+
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "Utilizar CPU"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "Utilizar GPU ATI"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "Utilizar GPU NVIDIA"
+
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "Utilizar GPU Intel"
+
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "Executar aplicações de teste?"
+
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "isto irá nos ajudar a desenvolver aplicações, mas poderá fazer com que os trabalhos falhem no seu computador"
+
+#: ../inc/prefs_project.inc:115
+msgid ""
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "Emails serão enviados de %1; confirme que o seu filtro de spam aceita este endereço."
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "OK para %1 e a sua equipa (se alguma) lhe enviarem e-mails?"
+
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "Deve o %1 mostrar os seus computadores no seu website?"
+
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(Mudar Vista)"
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr "Actualizar preferências"
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "Definições específicas do projecto"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr "Localização do computador por predefinição"
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "mau conjunto: %1"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "mau subconjunto: %1"
+
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "e"
 
@@ -1299,7 +1516,7 @@ msgid ""
 "people. Please change it."
 msgstr "O seu perfil foi definido como inaceitável. Não está visivel a outras pessoas. Por favor altere-o."
 
-#: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
+#: ../inc/profile.inc:172 ../user/friend.php:107 ../user/friend.php:174
 msgid "Database error"
 msgstr "Erro da base de dados"
 
@@ -1317,7 +1534,7 @@ msgstr "O utilizador está banido"
 msgid "No profile exists for that user ID."
 msgstr "Não existe nenhum perfil para o utilizador com esse ID."
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
 msgstr "Editar o seu perfil"
 
@@ -1365,11 +1582,12 @@ msgstr "Não existe na Base de Dados"
 msgid "pending"
 msgstr "pendente"
 
-#: ../inc/result.inc:114 ../user/forum_search.php:60
+#: ../inc/result.inc:114 ../user/forum_search.php:62
 msgid "All"
 msgstr "Todos"
 
 #: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
 msgid "In progress"
 msgstr "Em progresso"
 
@@ -1398,6 +1616,7 @@ msgid "Inactive"
 msgstr "Inactivo"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
 msgstr "Não enviado"
 
@@ -1562,127 +1781,135 @@ msgid "WU cancelled"
 msgstr "Unidade de trabalho cancelada"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "Resultado canónico em falta"
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
 msgstr "Erro irreconhecível: %1"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Task name"
 msgstr "Nome da tarefa"
 
-#: ../inc/result.inc:349 ../inc/result.inc:354 ../inc/result.inc:357
-#: ../inc/result.inc:360
+#: ../inc/result.inc:353 ../inc/result.inc:358 ../inc/result.inc:361
+#: ../inc/result.inc:364
 msgid "click for details"
 msgstr "carregue para detalhes"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Show IDs"
 msgstr "Mostrar IDs"
 
-#: ../inc/result.inc:354
+#: ../inc/result.inc:358
 msgid "Show names"
 msgstr "Mostrar nomes"
 
-#: ../inc/result.inc:357
+#: ../inc/result.inc:361
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
 msgstr "Unidade de trabalho"
 
-#: ../inc/result.inc:369
+#: ../inc/result.inc:373
 msgid "Computer"
 msgstr "Computador"
 
-#: ../inc/result.inc:372 ../inc/result.inc:631
+#: ../inc/result.inc:376 ../inc/result.inc:635
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
 msgstr "Tempo reportado<br />ou prazo limite "
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
 msgstr "explique"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
 msgstr "Estado"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
 msgstr "Tempo decorrido<br />(seg)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr "Tempo de CPU<br />(seg)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
 msgstr "Créditos"
 
-#: ../inc/result.inc:380 ../inc/result.inc:724
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:163
 msgid "Application"
 msgstr "Aplicação"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
 msgstr "Unidade de trabalho"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "Reportar prazo limite"
+
+#: ../inc/result.inc:637
 msgid "Received"
 msgstr "Recebido"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
 msgstr "Estado do servidor"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
 msgstr "Resultado"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
 msgstr "Estado do cliente"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
 msgstr "Estado de saída"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "Reportar prazo limite"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
 msgstr "Tempo decorrido"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
 msgstr "Tempo de CPU"
 
-#: ../inc/result.inc:641
+#: ../inc/result.inc:645
 msgid "Validate state"
 msgstr "Validar estado"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "Pico de FLOPS do dispositivo"
+
+#: ../inc/result.inc:648
 msgid "Application version"
 msgstr "Versão da aplicação"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
 msgstr "Ficheiros de saída"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
 msgstr "Stderr output"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "Estado"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
 msgstr "Nome da tarefa:"
 
@@ -1698,17 +1925,7 @@ msgstr "Palavras chave"
 msgid "Find teams with these words in their names or descriptions"
 msgstr "Pesquisar por equipas com estas palavras nos seus nomes ou descrições"
 
-#: ../inc/team.inc:43 ../inc/team.inc:122 ../inc/team.inc:233
-#: ../inc/team.inc:373 ../inc/team.inc:455 ../inc/user.inc:205
-#: ../inc/user.inc:317 ../user/account_finish.php:45
-#: ../user/create_account_form.php:98 ../user/edit_user_info_form.php:38
-#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
-#: ../user/team_search.php:72 ../user/top_users.php:63
-#: ../user/user_search.php:53 ../user/user_search.php:140
-msgid "Country"
-msgstr "País"
-
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:468
 msgid "Type of team"
 msgstr "Tipo de equipa"
 
@@ -1716,7 +1933,7 @@ msgstr "Tipo de equipa"
 msgid "Show only active teams"
 msgstr "Mostrar apenas equipas activas"
 
-#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:78 ../user/user_search.php:70
 msgid "Search"
 msgstr "Pesquisar"
 
@@ -1736,8 +1953,8 @@ msgstr "Solicitado por si"
 msgid "founder response deadline is %1"
 msgstr "o tempo de resposta limite do fundador é %1"
 
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
+#: ../inc/team.inc:72 ../inc/team.inc:570 ../inc/user.inc:358
+#: ../inc/user.inc:449
 msgid "None"
 msgstr "Nenhum"
 
@@ -1753,486 +1970,477 @@ msgstr "Deferido"
 msgid "Team info"
 msgstr "Informações da equipa"
 
-#: ../inc/team.inc:89 ../user/team_forum.php:70 ../user/team_search.php:69
+#: ../inc/team.inc:89 ../user/team_forum.php:72 ../user/team_search.php:82
 msgid "Description"
 msgstr "Descrição"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:101
 msgid "Web site"
 msgstr "Website"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:127
 msgid "Cross-project stats"
 msgstr "Cruzar estatísticas do projecto"
 
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:130 ../inc/team.inc:383 ../user/team_search.php:84
 msgid "Type"
 msgstr "Tipo"
 
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:134 ../user/team_manage.php:65
 msgid "Message board"
 msgstr "Fórum"
 
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:135 ../user/forum_forum.php:138 ../user/forum_index.php:98
 msgid "Threads"
 msgstr "Tópicos"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:143
 msgid "Join this team"
 msgstr "Juntar-se a esta equipa"
 
-#: ../inc/team.inc:137
+#: ../inc/team.inc:144
 msgid ""
 "Note: if 'OK to email' is set in your project preferences, joining a team "
 "gives its founder access to your email address."
 msgstr "Nota: Se o 'OK para o email' está definido nas preferências do projecto, juntar-se a uma equipa dá ao fundador acesso ao seu endereço de email."
 
-#: ../inc/team.inc:140
+#: ../inc/team.inc:147
 msgid "Not accepting new members"
 msgstr "Não aceita novos membros"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:154
 msgid "Foundership change requested"
 msgstr "Mudança de liderança pedida"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:155
 msgid "Respond by %1"
 msgstr "Responder por %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:159
 msgid "Team foundership change"
 msgstr "Mudança de liderança da equipa"
 
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:163 ../inc/team.inc:368
 msgid "Members"
 msgstr "Membros"
 
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:164 ../inc/team.inc:263
 msgid "Founder"
 msgstr "Fundador"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:178
 msgid "Admins"
 msgstr "Administradores"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:193
 msgid "New members in last day"
 msgstr "Novos membros no último dia"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:194
 msgid "Total members"
 msgstr "Total de membros"
 
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:194 ../inc/team.inc:195 ../inc/team.inc:196
 msgid "view"
 msgstr "ver"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:195
 msgid "Active members"
 msgstr "Membros activos"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:196
 msgid "Members with credit"
 msgstr "Membros com créditos"
 
-#: ../inc/team.inc:256
+#: ../inc/team.inc:265
 msgid "Admin"
 msgstr "Administrador"
 
-#: ../inc/team.inc:277 ../user/forum_user_posts.php:122
-#: ../user/top_hosts.php:93 ../user/top_teams.php:121
-#: ../user/top_users.php:127
+#: ../inc/team.inc:286 ../user/forum_user_posts.php:124
+#: ../user/top_hosts.php:93 ../user/top_teams.php:123
+#: ../user/top_users.php:128
 msgid "Previous %1"
 msgstr "Anterior %1"
 
-#: ../inc/team.inc:281 ../user/forum_user_posts.php:131
-#: ../user/profile_search_action.php:61 ../user/top_hosts.php:98
-#: ../user/top_teams.php:126 ../user/top_users.php:132
+#: ../inc/team.inc:290 ../user/forum_user_posts.php:133
+#: ../user/profile_search_action.php:63 ../user/top_hosts.php:98
+#: ../user/top_teams.php:128 ../user/top_users.php:133
 msgid "Next %1"
 msgstr "Próximo %1"
 
-#: ../inc/team.inc:289
+#: ../inc/team.inc:298
 msgid "No such team."
 msgstr "Não existe essa equipa."
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:311
 msgid "This operation requires foundership."
 msgstr "Esta operação requer privilégios de líder."
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:335
 msgid "This operation requires team admin privileges"
 msgstr "Esta operação requer privilégios de administrador da equipa"
 
-#: ../inc/team.inc:422
+#: ../inc/team.inc:437
 msgid ""
 "WARNING: this is a BOINC-wide team. If you make changes here, they will soon"
 " be overwritten. Edit the %1BOINC-wide team%2 instead."
 msgstr "ATENÇÃO: esta é uma equipa ampla do BOINC. Se fizer alterações aqui, elas brevemente serão re-escritas. Edite a %1equipa ampla do BOINC%2 em alternativa."
 
-#: ../inc/team.inc:428
+#: ../inc/team.inc:443
 msgid ""
 "%1Privacy note%2: if you create a team, your project preferences (resource "
 "share, graphics preferences) will be visible to the public."
 msgstr "%1Nota privada%2: se criar uma equipa, as preferências do projecto (partilha de recursos, preferências gráficas) ficarão visíveis ao público."
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
 msgstr "Nome da equipa, versão do texto"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:448
 msgid "Don't use HTML tags."
 msgstr "Não use tags HTML."
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
 msgstr "Nome da equipa, versão de HTML"
 
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:453 ../inc/team.inc:463
 msgid "You may use %1limited HTML tags%2."
 msgstr "Pode usar %1tags limitadas HTML%2."
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
 msgstr "Se não sabe o que é HTML, deixe esta caixa em branco."
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
 msgstr "URL da página web da equipa, se existir"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "without \"http://\""
 msgstr "sem \"http://\""
 
-#: ../inc/team.inc:443
+#: ../inc/team.inc:458
 msgid "This URL will be linked to from the team's page on this site."
 msgstr "Este URL será linkado para a página da equipa neste site."
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:461
 msgid "Description of team"
 msgstr "Descrição da equipa"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:477
 msgid "Accept new members?"
 msgstr "Aceitar novos membros?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
 msgstr "Perfil do utilizador"
 
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
 msgstr "Projectos em que está a participar"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
 msgstr "Projectos em que %1 está a participar"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Project"
 msgstr "Projecto"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Click for user page"
 msgstr "Carregue para página do utilizador"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
 msgstr "A partir de"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
 msgstr "Computação e créditos"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
 msgstr "Computadores nesta conta"
 
-#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
-#: ../user/view_profile.php:64
+#: ../inc/user.inc:154 ../inc/user.inc:155 ../inc/user.inc:233
+#: ../inc/user.inc:312 ../inc/user.inc:407 ../inc/user.inc:482
+#: ../user/view_profile.php:66
 msgid "View"
 msgstr "Ver"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
 msgstr "ID de projectos cruzados"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
 msgstr "Estatísticas de projectos cruzados"
 
-#: ../inc/user.inc:163
+#: ../inc/user.inc:166
 msgid "Account"
 msgstr "Conta"
 
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:168 ../inc/user.inc:358 ../inc/user.inc:447
+#: ../inc/user.inc:449 ../user/user_search.php:124
 msgid "Team"
 msgstr "Equipa"
 
-#: ../inc/user.inc:167
+#: ../inc/user.inc:170
 msgid "Cross-project"
 msgstr "Projecto cruzado"
 
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
+#: ../inc/user.inc:171
 msgid "Certificate"
 msgstr "Certificado de participação"
 
-#: ../inc/user.inc:169
+#: ../inc/user.inc:172
 msgid "Stats on your cell phone"
 msgstr "Dados do seu telemóvel"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr "Tipo de notificação desconhecida: %1"
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
 msgstr "Informações da conta"
 
-#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
-#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
+#: ../inc/user.inc:206 ../user/get_passwd.php:31
+#: ../user/team_email_list.php:73
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:210 ../inc/user.inc:400
 msgid "URL"
 msgstr "URL"
 
-#: ../inc/user.inc:206
+#: ../inc/user.inc:213
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
 msgstr "%1 membro desde"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
 msgstr "Mudar"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
 msgstr "endereço de e-mail"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
 msgstr "palavra-passe"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
 msgstr "outras informações da conta"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
 msgstr "ID do utilizador"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
 msgstr "Utilizado nas funções da comunidade"
 
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "Chaves da conta"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
 msgstr "Quando e como o BOINC utiliza o seu computador"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
 msgstr "Preferências de computação"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
 msgstr "Fórum e mensagens privadas"
 
-#: ../inc/user.inc:229 ../user/edit_forum_preferences_form.php:31
+#: ../inc/user.inc:245 ../user/edit_forum_preferences_form.php:31
 msgid "Community preferences"
 msgstr "Preferências da comunidade"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
 msgstr "Preferências para este projecto"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
 msgstr "%1 preferências"
 
-#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../inc/user.inc:266
+msgid "View the profile of %1"
+msgstr "Ver o perfil de %1"
+
+#: ../inc/user.inc:267 ../inc/user.inc:316 ../inc/user.inc:482
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../inc/user.inc:307 ../user/sample_index.php:114
 msgid "Community"
 msgstr "Comunidade"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr "Eliminar"
-
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "Criar"
 
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:321 ../inc/user.inc:454
 msgid "%1 posts"
 msgstr "%1 posts"
 
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:339 ../user/edit_forum_preferences_form.php:40
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ../inc/user.inc:269
+#: ../inc/user.inc:346
 msgid "Quit team"
 msgstr "Sair da equipa"
 
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:348 ../inc/user.inc:365
 msgid "Administer"
 msgstr "Administrar"
 
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:354 ../inc/user.inc:367
 msgid "(foundership change request pending)"
 msgstr "(solicitação de mudança de liderança pendente)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
 msgstr "Membro da equipa"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
 msgstr "encontrar uma equipa"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
 msgstr "Fundador, mas não membro de"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
 msgstr "Encontrar amigos"
 
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
+#: ../inc/user.inc:383 ../inc/user.inc:385 ../inc/user.inc:465
+#: ../inc/user.inc:467 ../inc/user.inc:476
 msgid "Friends"
 msgstr "Amigos"
 
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
+#: ../inc/user.inc:407 ../inc/user.inc:409 ../user/server_status.php:153
 msgid "Computers"
 msgstr "Computadores"
 
-#: ../inc/user.inc:338
+#: ../inc/user.inc:415
 msgid "Donor"
 msgstr "Doador"
 
-#: ../inc/user.inc:378
+#: ../inc/user.inc:458
 msgid "Contact"
 msgstr "Contactar"
 
-#: ../inc/user.inc:381
+#: ../inc/user.inc:461
 msgid "This person is a friend"
 msgstr "Esta pessoa é amiga"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
 msgstr "Cancelar amizade"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
 msgstr "Pedido pendente"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
 msgstr "Adicionar como amigo"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
 msgstr "o nome de utilizador não pode estar vazio ou conter espaços em branco"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
 msgstr "o nome de utilizador tem de ser preenchido"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
 msgstr "o nome de utilizador não pode conter tags HTML"
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
 msgstr "sair"
 
-#: ../inc/util.inc:133
+#: ../inc/util.inc:163
 msgid "log in"
 msgstr "entrar"
 
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
-msgid "Log in"
-msgstr "Entrar"
-
-#: ../inc/util.inc:205 ../user/create_account_form.php:40
+#: ../inc/util.inc:239 ../user/create_account_form.php:41
 msgid "Create an account"
 msgstr "Criar uma conta"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
 msgstr "Página de estado do servidor"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
 msgstr "Ocorreu um erro na base de dados aquando do seu pedido; por favor tente mais tarde."
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
 msgstr "Não foi possivel lidar com o pedido"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
 msgstr "horas"
 
-#: ../inc/util.inc:280
+#: ../inc/util.inc:309
 msgid "min"
 msgstr "min"
 
-#: ../inc/util.inc:283
+#: ../inc/util.inc:312
 msgid "sec"
 msgstr "seg"
 
-#: ../inc/util.inc:444
+#: ../inc/util.inc:473
 msgid ""
 "Link has timed out. Please click Back, refresh the page, and try again."
 msgstr "Expirou o tempo limite do link. Por favor, carregue em Voltar Atrás, faça actualizar a página e depois tente novamente."
 
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "Ver o perfil de %1"
-
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr "Utilizar tags BBcode para formatar o texto"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
 msgstr "Projecto em baixo para manutenção"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
 msgstr "%1 está temporariamente em baixo para manutenção. Por favor, tente mais tarde."
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
 msgstr "Não foi possivel conectar à base de dados - por favor, tente mais tarde"
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
 msgstr "Não foi possivel seleccionar a base de dados - por favor, tente mais tarde"
 
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "caracteres restantes"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
 msgstr "Manter-se logado neste computador"
 
@@ -2240,22 +2448,6 @@ msgstr "Manter-se logado neste computador"
 msgid "Finish account setup"
 msgstr "Finalizar registo da conta"
 
-#: ../user/account_finish.php:41 ../user/create_account_form.php:79
-msgid "Identifies you on our web site. Use your real name or a nickname."
-msgstr "indentifica-o no seu website. Use o seu nome real ou um nome de utilizador."
-
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
-msgid "Select the country you want to represent, if any."
-msgstr "Seleccione o País que represente, se algum."
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Postal or ZIP Code"
-msgstr "Código Postal"
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Optional"
-msgstr "Opcional"
-
 #: ../user/account_finish_action.php:27
 msgid "You must supply a name for your account"
 msgstr "Tem que fornecer um nome para a sua conta"
@@ -2264,34 +2456,38 @@ msgstr "Tem que fornecer um nome para a sua conta"
 msgid "HTML tags not allowed in name"
 msgstr "Tags HTML não são permitidas no nome"
 
-#: ../user/add_venue.php:81
+#: ../user/add_venue.php:40 ../user/add_venue.php:64 ../user/prefs_edit.php:41
+#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+msgid "Edit %1 preferences"
+msgstr "Editar preferências %1"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr "Adicionar %1 preferências para %2"
 
-#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
+#: ../user/apps.php:31 ../user/sample_index.php:104
 msgid "Applications"
 msgstr "Aplicações"
 
-#: ../user/apps.php:33
+#: ../user/apps.php:32
 msgid ""
 "%1 currently has the following applications. When you participate in %1, "
-"work for one or more of these applications will be assigned to your "
+"tasks for one or more of these applications will be assigned to your "
 "computer. The current version of the application will be downloaded to your "
 "computer. This happens automatically; you don't have to do anything."
-msgstr "%1 actualmente tem as seguintes aplicações. Quando participa em %1, o trabalho para uma ou mais destas aplicações será atribuída a este computador. O download da versão actual da aplicação será feito para o seu computador. Isto acontece automaticamente; não tem que fazer nada."
+msgstr "% 1 tem actualmente as seguintes aplicações. Quando participa em % 1, as tarefas para uma ou mais dessas aplicações serão atribuídas ao seu computador. A versão actual da aplicação será transferida para o seu computador. Esta acção é automática, não precisa fazer nada."
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "Plataforma"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
 msgstr "Versão"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "Tempo de instalação"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "Computação média"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2322,153 +2518,79 @@ msgid "Underline"
 msgstr "Sublinhar"
 
 #: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "Rasurado"
+
+#: ../user/bbcode.php:36
 msgid "Superscript"
 msgstr "Superscript"
 
-#: ../user/bbcode.php:36
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "Texto grande"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
 msgstr "Texto vermelho"
 
-#: ../user/bbcode.php:38
+#: ../user/bbcode.php:39
 msgid "link to website"
 msgstr "link para o website"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "Quoted text"
 msgstr "Texto citado"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
 msgstr "use para blocos de texto citados"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
 msgstr "use para mostrar uma imagem"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
 msgstr "Pedaço de código aqui"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
 msgstr "use para mostrar algum código"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
 msgstr "Texto pré-formatado"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
 msgstr "use para mostrar texto pré-formatado "
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
 msgstr "Item 1"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
 msgstr "Item2"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
 msgstr "Item 2"
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
 msgstr "Usar a hiperligação para seguir o bilhete no site da Web do BOINC"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "use para linkar a Trac Wiki no website do BOINC"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "use para linkar ao SVN de alterações no website do BOINC"
-
-#: ../user/bbcode.php:53
+#: ../user/bbcode.php:52
 msgid ""
 "If you don't close a tag or don't specify a parameter correctly,\n"
 "the raw tag itself will display instead of the formatted text."
 msgstr "Se não fechar uma tag ou não especificar um parâmetro correctamente,\na própria tag não formatada aparecerá em vez do texto formatado."
 
-#: ../user/bs_sample_index.php:44
-msgid "Participants"
-msgstr "Patricipantes"
-
-#: ../user/bs_sample_index.php:46
-msgid "Do work"
-msgstr "Realizar trabalho"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-#: ../user/home.php:49 ../project.sample/project.inc:43
-msgid "Your account"
-msgstr "A sua conta"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-msgid "view stats, modify preferences"
-msgstr "ver estado, modificar preferências"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-#: ../user/team.php:25
-msgid "Teams"
-msgstr "Equipas"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-msgid "create or join a team"
-msgstr "criar ou juntar-se a uma equipa"
-
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
-msgid "User of the day"
-msgstr "Utilizador do dia"
-
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-msgid "Server status"
-msgstr "Estado do servidor"
-
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
-msgid "Profiles"
-msgstr "Perfis"
-
-#: ../user/bs_sample_index.php:61
-msgid "User search"
-msgstr "Pesquisar utilizador"
-
-#: ../user/bs_sample_index.php:64
-msgid "Statistics"
-msgstr "Estatistícas"
-
-#: ../user/bs_sample_index.php:65 ../user/stats.php:30
-#: ../user/top_users.php:116
-msgid "Top participants"
-msgstr "Top - Participantes"
-
-#: ../user/bs_sample_index.php:66 ../user/stats.php:31
-msgid "Top computers"
-msgstr "Top - Computadores"
-
-#: ../user/bs_sample_index.php:67 ../user/stats.php:32 ../user/team.php:46
-msgid "Top teams"
-msgstr "Top - Equipas"
-
-#: ../user/bs_sample_index.php:68 ../user/gpu_list.php:182
-#: ../user/stats.php:33
-msgid "Top GPU models"
-msgstr "Top de modelos GPU"
-
-#: ../user/bs_sample_index.php:70
-msgid "Languages"
-msgstr "Linguagens"
-
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "Leia as nossas regras e politícas"
-
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
 msgstr "Não é possivel criar conta"
@@ -2477,192 +2599,152 @@ msgstr "Não é possivel criar conta"
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr "Carregue no botão <b>Voltar atrás</b> do seu navegador para tentar outra vez."
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
 msgstr "A resposta reCAPTCHA nA resposta reCAPTCHA não está correcta. Por favor, tente novamente."
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
 msgstr "Tem que fornecer um código de convite para criar uma conta."
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
 msgstr "O código de convite que inseriu não é válido."
 
-#: ../user/create_account_action.php:84
+#: ../user/create_account_action.php:83
 msgid ""
 "Invalid email address: you must enter a valid address of the form "
 "name at domain"
 msgstr "Endereço de email inválido: tem de inserir um endereço válido no formato nome at dominio"
 
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:87
 msgid "There's already an account with that email address."
 msgstr "Já existe uma conta com esse endereço de email."
 
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:93 ../user/edit_passwd_action.php:32
 msgid "New passwords are different"
 msgstr "Novas palavras passe são diferentes"
 
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:100 ../user/edit_passwd_action.php:40
 msgid "Passwords may only include ASCII characters."
 msgstr "Palavras passe podem apenas incluir caracteres ASCII."
 
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:105 ../user/edit_passwd_action.php:44
 msgid "New password is too short: minimum password length is %1 characters."
 msgstr "A nova palavra passe é demasiado pequena: o comprimento minimo da palavra passe é de %1 caracteres."
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
 msgstr "Não foi possivel criar conta"
 
-#: ../user/create_account_form.php:44
+#: ../user/create_account_form.php:45
 msgid ""
 "NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
 "select Add Project, and enter an email address and password."
 msgstr "NOTA: Se usa o Gestor BOINC, não use este formulário. Apenas execute o BOINC, seleccione Adicionar Projecto e insira um endereço de email e palavra-passe."
 
-#: ../user/create_account_form.php:61
+#: ../user/create_account_form.php:57
 msgid ""
 "This account will belong to the team %1 and will have the project "
 "preferences of its founder."
 msgstr "Esta conta irá pertencer à equipa %1 e terá as preferências do projecto do seu fundador."
 
-#: ../user/create_account_form.php:73
-msgid "Invitation Code"
-msgstr "Código de Convite"
-
-#: ../user/create_account_form.php:73
-msgid "A valid invitation code is required to create an account."
-msgstr "Um código de convite válido é necessário para criar uma conta."
-
-#: ../user/create_account_form.php:83
-msgid "Email Address"
-msgstr "Endereço de Email"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "Tem que ser um endereço válido do form 'name at domain'."
-
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
-msgid "Password"
-msgstr "Palavra passe"
-
-#: ../user/create_account_form.php:93
-msgid "Must be at least %1 characters"
-msgstr "Tem que ter pelo menos %1 caracteres"
-
-#: ../user/create_account_form.php:96
-msgid "Confirm password"
-msgstr "Confirme palavra passe"
-
-#: ../user/create_account_form.php:113
-msgid "Please enter the words shown in the image"
-msgstr "Por favor insira as palavras mostradas na imagem"
-
-#: ../user/create_account_form.php:119
-msgid "Create account"
-msgstr "Criar conta"
-
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
 msgstr "Imagem"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
 msgstr "%1 A imagem do seu perfil é mostrada à esquerda."
 
-#: ../user/create_profile.php:66
+#: ../user/create_profile.php:68
 msgid ""
 "To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
 " or less)."
 msgstr "Para a substituir, carregue no botão \"Procurar em\" e seleccione um ficheiro JPEG ou PNG (%1 ou menos)."
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
 msgstr "Para a remover do perfil, seleccione esta caixa:"
 
-#: ../user/create_profile.php:77
+#: ../user/create_profile.php:79
 msgid ""
 "If you would like include a picture with your profile, click the \"Browse\" "
 "button and select a JPEG or PNG file. Please select images of %1 or less."
 msgstr "Se gostava de incluir uma imagem com o seu perfil, carregue no botão \"Procurar em\" e seleccione um ficheiro JPEG ou PNG. Por favor, seleccione imagens de%1 ou menos."
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
 msgstr "Linguagem"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
 msgstr "Seleccione a linguagem na qual o seu perfil está escrito:"
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
 msgstr "Submeter perfil"
 
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr "Por favor insira as palavras mostradas na imagem."
-
-#: ../user/create_profile.php:115
+#: ../user/create_profile.php:112
 msgid "Create/edit profile"
 msgstr "Criar/editar perfil"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
 msgstr "O formato da imagem que fez upload não é suportado."
 
-#: ../user/create_profile.php:166
+#: ../user/create_profile.php:163
 msgid ""
 "Your %1profile%2 lets you share your opinions and background with the %3 "
 "community."
 msgstr "O seu %1perfil%2 permite-lhe partilhar as suas opiniões e os fundos de trabalho com a %3 comunidade."
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
 msgstr "As palavras que escreveu não estão correctas. Por favor, tente novamente."
 
-#: ../user/create_profile.php:222
+#: ../user/create_profile.php:218
 msgid ""
 "Your first response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "A sua primeira resposta foi indicada como spam pelo sistema Akismet anti-spam. Por favor, modifique o texto e tente novamente."
 
-#: ../user/create_profile.php:230
+#: ../user/create_profile.php:226
 msgid ""
 "Your second response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "A sua segunda resposta foi indicada como spam pelo sistema Akismet anti-spam. Por favor, modifique o texto e tente novamente."
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
 msgstr "A sua submissão do perfil estava vazia."
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
 msgstr "Não foi possivel actualizar o perfil: erro da base de dados"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
 msgstr "Não foi possivel criar o perfil: erro da base de dados"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
 msgstr "Perfil salvo"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
 msgstr "Parabéns! O seu perfil foi inserido com sucesso na nossa base de dados."
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
 msgstr "%1Ver o seu perfil%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
 msgstr "Criar um perfil"
 
-#: ../user/create_profile.php:343
+#: ../user/create_profile.php:339
 msgid ""
 "To prevent spam, an average credit of %1 or greater is required to create or"
 " edit a profile.  We apologize for this inconvenience."
@@ -2703,9 +2785,9 @@ msgstr "Esta acção não é reversivel.\nAssim que a sua conta seja eliminada,
 msgid "Are you sure you want to delete your account?"
 msgstr "Tem a certeza que quer apagar a sua conta?"
 
-#: ../user/delete_account.php:79 ../user/delete_profile.php:52
-#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238
-#: ../user/prefs_remove.php:52 ../user/user_search.php:59
+#: ../user/delete_account.php:79 ../user/delete_profile.php:54
+#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:240
+#: ../user/prefs_remove.php:53 ../user/user_search.php:59
 #: ../user/user_search.php:64
 msgid "Yes"
 msgstr "Sim"
@@ -2714,8 +2796,8 @@ msgstr "Sim"
 msgid "Delete this account"
 msgstr "Apagar esta conta"
 
-#: ../user/delete_account.php:80 ../user/delete_profile.php:53
-#: ../user/friend.php:239 ../user/user_search.php:58
+#: ../user/delete_account.php:80 ../user/delete_profile.php:55
+#: ../user/friend.php:241 ../user/user_search.php:58
 #: ../user/user_search.php:63
 msgid "No"
 msgstr "Não"
@@ -2724,44 +2806,44 @@ msgstr "Não"
 msgid "Do not delete this account"
 msgstr "Não apagar esta conta"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
 msgstr "não foi possivel apagar o perfil - por favor, tente mais tarde"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "Confirmar eliminação"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
 msgstr "O seu perfil foi apagado."
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
 msgstr "Confimar eliminação do perfil"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
 msgstr "Tem a certeza?"
 
-#: ../user/delete_profile.php:44
+#: ../user/delete_profile.php:46
 msgid ""
 "Deleted profiles are gone forever and cannot be recovered --\n"
 "you will have to start from scratch\n"
 "if you want another profile in the future."
 msgstr "Os perfis são eliminados para sempre e não podem ser recuperados --\nterá que começar do início\nse quiser outro perfil no futuro."
 
-#: ../user/delete_profile.php:48
+#: ../user/delete_profile.php:50
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
 msgstr "Se tem a certeza, carregue em 'Sim'\npara remover o seu perfil da nossa base de dados."
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
 msgstr "Apagar o meu perfil"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
 msgstr "Não apagar o meu perfil"
 
@@ -2942,241 +3024,201 @@ msgstr "Esta acção apagará quaisquer mudanças que tenha feito nas preferênc
 msgid "Reset preferences"
 msgstr "Preferências de reset"
 
-#: ../user/edit_forum_preferences_action.php:88
+#: ../user/edit_forum_preferences_action.php:95
 msgid "Error: Not the right kind of file, only PNG and JPEG are supported."
 msgstr "Erro: Tipo de ficheiro incorrecto, apenas PNG e JPEG são suportados."
 
-#: ../user/edit_forum_preferences_action.php:114
+#: ../user/edit_forum_preferences_action.php:120
 msgid "Your signature was too long, please keep it less than 250 characters."
 msgstr "A sua assinatura é demasiado longa, por favor mantenha-a com menos de 250 caracteres"
 
-#: ../user/edit_forum_preferences_action.php:132
-#: ../user/edit_forum_preferences_action.php:146
+#: ../user/edit_forum_preferences_action.php:139
+#: ../user/edit_forum_preferences_action.php:153
 msgid "No such user: %1"
 msgstr "Não existe tal utilizador: %1"
 
-#: ../user/edit_forum_preferences_form.php:56
+#: ../user/edit_forum_preferences_form.php:45
 msgid ""
 "How should we notify you of new private messages, friend requests, posts in "
 "subscribed threads, and other events?"
 msgstr "Como é que devemos notificá-lo de novas mensagens privadas, solicitações de amizade, posts em tópicos subscritos e outros eventos?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
 msgstr "Página da minha Conta (sem email)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
 msgstr "Imediatamente, por email"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
 msgstr "Num simples email diário"
 
-#: ../user/edit_forum_preferences_form.php:75
+#: ../user/edit_forum_preferences_form.php:65
 msgid "Message-board identity"
 msgstr "Identidade no fórum"
 
-#: ../user/edit_forum_preferences_form.php:76
+#: ../user/edit_forum_preferences_form.php:66
 msgid "Avatar"
 msgstr "Avatar"
 
-#: ../user/edit_forum_preferences_form.php:77
+#: ../user/edit_forum_preferences_form.php:67
 msgid "An image representing you on the message boards."
 msgstr "Uma imagem que o represente nos fóruns."
 
-#: ../user/edit_forum_preferences_form.php:78
+#: ../user/edit_forum_preferences_form.php:68
 msgid "Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels"
 msgstr "Formato: JPG ou PNG. Tamanho: no máximo 4kb, 100x100 pixéis"
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
 msgstr "Não use avatar"
 
-#: ../user/edit_forum_preferences_form.php:82
+#: ../user/edit_forum_preferences_form.php:72
 msgid "Use a Globally Recognized Avatar provided by %1"
 msgstr "Usar um avatar Reconhecido Globalmente fornecido por %1"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
 msgstr "Usar este avatar que foi feito o upload:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
 msgstr "Pré-visualização do avatar"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
 msgstr "O seu avatar aparecerá assim"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
 msgstr "Assinatura para posts no fórum"
 
-#: ../user/edit_forum_preferences_form.php:99
+#: ../user/edit_forum_preferences_form.php:89
 msgid ""
 "Check out %1various free services%2\n"
 "<br> providing dynamic 'signature images'\n"
 "<br> showing your latest credit info, project news, etc."
 msgstr "Verifique %1vários serviços grátis%2\n<br> fornecendo 'imagens de assinatura' dinâmicas'\n<br> mostrando informação sobre os seus ultimos créditos, novidades do projecto, etc."
 
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr "caracteres restantes"
-
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
 msgstr "Anexar assinaura por padrão"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
 msgstr "Pré-visualização da assinatura"
 
-#: ../user/edit_forum_preferences_form.php:109
+#: ../user/edit_forum_preferences_form.php:97
 msgid "This is how your signature will look in the forums"
 msgstr "A sua assinatura aparecerá assim nos fóruns"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "Visor de mensagens"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
 msgstr "O que mostrar"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
 msgstr "Ocultar imagens avatar"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
 msgstr "Ocultar assinaturas"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
 msgstr "Mostrar imagens como links"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
 msgstr "Abrir links numa nova janela/separador"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
 msgstr "Sublinhar utilizadores especiais"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
 msgstr "Mostrar este número de mensagens por página"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
 msgstr "Como ordenar"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "Tópicos:"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "Posts:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
 msgstr "Saltar para os primeiros posts no tópico automaticamente"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
 msgstr "Não mover posts sticky para o topo"
 
-#: ../user/edit_forum_preferences_form.php:148
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
 msgstr "Filtragem de mensagens"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
 msgstr "Filtragem de utilizadores"
 
-#: ../user/edit_forum_preferences_form.php:165
+#: ../user/edit_forum_preferences_form.php:154
 msgid "Ignore message board posts and private messages from these users."
 msgstr "Ignorar posts no fórum e mensagens privadas destes utilizadores"
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
 msgstr "ID do utilizador (Por exemplo: 123456789)"
 
-#: ../user/edit_forum_preferences_form.php:168 ../user/pm.php:251
+#: ../user/edit_forum_preferences_form.php:157 ../user/pm.php:256
 msgid "Add user to filter"
 msgstr "Adicionar utilizador ao filtro"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
 msgstr "Carregue aqui para actualizar preferências"
 
-#: ../user/edit_forum_preferences_form.php:175
-#: ../user/edit_forum_preferences_form.php:177
+#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:166
 msgid "Reset"
 msgstr "Reset"
 
-#: ../user/edit_forum_preferences_form.php:176
+#: ../user/edit_forum_preferences_form.php:165
 msgid "Or click here to reset preferences to the defaults"
 msgstr "Ou carregue aqui para redefinir as preferências para a padrão"
 
 #: ../user/edit_passwd_action.php:50
-msgid "Invalid account key"
-msgstr "Palavra chave inválida"
-
-#: ../user/edit_passwd_action.php:55
-msgid "No account with that email address was found"
-msgstr "Não foi encontrada nenhuma conta com esse endereço de email "
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "Palavra passe inválida"
-
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
-msgid "Change password"
-msgstr "Mudar palavra passe"
-
-#: ../user/edit_passwd_action.php:67
-msgid "Your password has been changed."
-msgstr "A sua palavra passe foi alterada."
-
-#: ../user/edit_passwd_action.php:69
 msgid ""
 "We can't update your password due to a database problem. Please try again "
 "later."
 msgstr "Não foi possivel actualizar a sua palavra passe devido a problemas na base de dados. Por favor, tente mais tarde."
 
-#: ../user/edit_passwd_form.php:39
-msgid "You can identify yourself using either"
-msgstr "Pode-se identificar usando um ou outro"
-
-#: ../user/edit_passwd_form.php:41
-msgid "your email address and old password"
-msgstr "o seu endereço de email e palavra passe antiga"
-
-#: ../user/edit_passwd_form.php:42
-msgid "your account key"
-msgstr "a sua palavra chave fraca"
-
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr "Palavra passe actual"
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr "<b>OU</b>: Palavra chave da conta"
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
+msgid "Change password"
+msgstr "Mudar palavra passe"
 
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr "Obter palavra chave da conta por email"
+#: ../user/edit_passwd_action.php:54
+msgid "Your password has been changed."
+msgstr "A sua palavra passe foi alterada."
 
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
 msgstr "Nova palavra passe"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
 msgstr "nova palavra passe, outra vez"
 
@@ -3387,19 +3429,19 @@ msgstr "Use o botão 'voltar atrás' do seu navegador para regressar ao formulá
 msgid "Sending emails"
 msgstr "Enviando emails"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr "email enviado com sucesso a %1"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr "falhou o envio do email a %1: %2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr "Obrigado por dizer aos seus amigos acerca de %1"
 
-#: ../user/ffmail_action.php:94
+#: ../user/ffmail_action.php:92
 msgid ""
 "You forgot to enter your friends' names and/or email addresses; Please "
 "%1return to the form%2 and enter them."
@@ -3450,79 +3492,73 @@ msgstr "Mensagem adicional (opcional):"
 msgid "Send"
 msgstr "Enviar"
 
-#: ../user/forum_banishment_vote.php:35
-#: ../user/forum_banishment_vote_action.php:33
+#: ../user/forum_banishment_vote.php:37
+#: ../user/forum_banishment_vote_action.php:35
 msgid "You are not authorized to banish users."
 msgstr "Não está autorizado a banir utilizadores."
 
-#: ../user/forum_banishment_vote.php:41 ../user/forum_banishment_vote.php:46
+#: ../user/forum_banishment_vote.php:43 ../user/forum_banishment_vote.php:48
 msgid "Banishment Vote"
 msgstr "Voto para banir"
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
 msgstr "Não foi encontrado o utilizador com esse ID."
 
-#: ../user/forum_banishment_vote.php:54 ../user/forum_moderate_post.php:76
+#: ../user/forum_banishment_vote.php:57 ../user/forum_moderate_post.php:79
 msgid "User is already banished"
 msgstr "O utilizador já está banido"
 
-#: ../user/forum_banishment_vote.php:59 ../user/forum_moderate_post.php:79
+#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_post.php:82
 msgid ""
 "Are you sure you want to banish %1?<br/>This will prevent %1 from posting "
 "for chosen time period.<br/>It should be done only if %1 has consistently "
 "exhibited trollish behavior."
 msgstr "Tem a certeza que quer banir %1?<br>/>Isto vai evitar que %1 coloque posts por um determinado periodo de tempo.<br>Isto só deve ser feito se %1 tiver constantemente exibido um comportamento inadequado. "
 
-#: ../user/forum_banishment_vote.php:61
+#: ../user/forum_banishment_vote.php:64
 msgid ""
 "Select the reason category, optionally write a longer description of why the"
 " user should be banished."
 msgstr "Seleccione a categoria da razão e opcionalmente escreva uma descrição mais detalhada da razão porque o utilizador deve ser banido."
 
-#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
+#: ../user/forum_banishment_vote.php:65 ../user/forum_moderate_thread.php:56
 msgid "Category"
 msgstr "Categoria"
 
-#: ../user/forum_banishment_vote.php:64
-#: ../user/forum_banishment_vote_action.php:57
-#: ../user/forum_moderate_post.php:55 ../user/forum_moderate_thread.php:52
+#: ../user/forum_banishment_vote.php:67
+#: ../user/forum_banishment_vote_action.php:59
+#: ../user/forum_moderate_post.php:58 ../user/forum_moderate_thread.php:58
 msgid "Obscene"
 msgstr "Obsceno"
 
-#: ../user/forum_banishment_vote.php:65
-#: ../user/forum_banishment_vote_action.php:59
-#: ../user/forum_moderate_post.php:56 ../user/forum_moderate_thread.php:53
+#: ../user/forum_banishment_vote.php:68
+#: ../user/forum_banishment_vote_action.php:61
+#: ../user/forum_moderate_post.php:59 ../user/forum_moderate_thread.php:59
 msgid "Flame/Hate mail"
 msgstr "Incendiário/Mail de ódio"
 
-#: ../user/forum_banishment_vote.php:66
-#: ../user/forum_banishment_vote_action.php:61
-#: ../user/forum_moderate_post.php:59
+#: ../user/forum_banishment_vote.php:69
+#: ../user/forum_banishment_vote_action.php:63
+#: ../user/forum_moderate_post.php:62
 msgid "User Request"
 msgstr "Solicitação de utilizdor"
 
-#: ../user/forum_banishment_vote.php:67
-#: ../user/forum_banishment_vote_action.php:63
-#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:55
-msgid "Other"
-msgstr "Outro"
-
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_post.php:53
-#: ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_post.php:56
+#: ../user/forum_moderate_thread.php:100
 msgid "Reason"
 msgstr "Razão"
 
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_thread.php:100
 msgid "Mailed if nonempty"
 msgstr "Enviado por correio, se não vazio"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "Proceder com a votação"
 
-#: ../user/forum_banishment_vote_action.php:39
-#: ../user/forum_moderate_post_action.php:63
+#: ../user/forum_banishment_vote_action.php:41
+#: ../user/forum_moderate_post_action.php:66
 msgid "You must specify an action..."
 msgstr "Tem que especificar uma acção..."
 
@@ -3536,7 +3572,7 @@ msgstr "Não pode mais editar este post.<br>/Os posts podem apenas ser editados
 msgid "You are not authorized to edit this post."
 msgstr "Não está autorizado a editar este post."
 
-#: ../user/forum_edit.php:86 ../user/forum_search.php:72
+#: ../user/forum_edit.php:86 ../user/forum_search.php:74
 msgid "Forum"
 msgstr "Fórum"
 
@@ -3545,828 +3581,828 @@ msgid "Edit your message"
 msgstr "Editar a sua mensagem"
 
 #: ../user/forum_edit.php:115 ../user/forum_edit.php:120
-#: ../user/forum_post.php:109 ../user/forum_post.php:111
-#: ../user/team_forum.php:69
+#: ../user/forum_post.php:113 ../user/forum_post.php:115
+#: ../user/team_forum.php:71
 msgid "Title"
 msgstr "Título"
 
-#: ../user/forum_edit.php:144 ../user/forum_post.php:129
+#: ../user/forum_edit.php:144 ../user/forum_post.php:133
 msgid "Add my signature to this post"
 msgstr "Adicionar a minha assinatura a este post"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
 msgstr "Não visivel a si"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "Mensagem da equipa do fórum para %1"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "Novo tópico"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
 msgstr "Adicionar um novo tópico neste fórum"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
 msgstr "Este fórum está disponivel como %1RSS feed%2"
 
-#: ../user/forum_forum.php:174
+#: ../user/forum_forum.php:178
 msgid "This thread is hidden"
 msgstr "Este tópico está oculto"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "This thread is sticky and locked, and you haven't read it yet"
 msgstr "Este tópico é sticky e está trancado e ainda não o leu"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
 msgstr "sticky/trancado/não lido"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
 msgstr "Este tópico é sticky e ainda não o leu"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "sticky/unread"
 msgstr "sticky/não lidas"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "You haven't read this thread yet, and it's locked"
 msgstr "Ainda não leu este tópico e está trancado"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
 msgstr "não lida/bloqueada"
 
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
 msgstr "Ainda não leu este tópico"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "This thread is sticky and locked"
 msgstr "Este tópico é sticky e está bloqueado"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "sticky/locked"
 msgstr "sticky/trancado"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "This thread is sticky"
 msgstr "Este tópico é sticky"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "sticky"
 msgstr "sticky"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "This thread is locked"
 msgstr "Este tópico está bloqueado"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
 msgstr "bloqueado"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "You read this thread"
 msgstr "Já leu este tópico"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "read"
 msgstr "lido"
 
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "Perguntas e respostas"
 
-#: ../user/forum_help_desk.php:30
+#: ../user/forum_help_desk.php:32
 msgid ""
 "Talk live via Skype with a volunteer, in any of several languages. Go to "
 "%1BOINC Online Help%2."
 msgstr "Fale ao vivo via Skype com um voluntário, em alguma das várias linguas. Vá a %1Página de Ajuda do BOINC%2."
 
-#: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
+#: ../user/forum_help_desk.php:46 ../user/forum_index.php:97
 msgid "Topic"
 msgstr "Tópico"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "Perguntas"
 
-#: ../user/forum_index.php:53 ../user/team_forum.php:68
+#: ../user/forum_index.php:58 ../user/team_forum.php:70
 msgid "Discussion among members of %1"
 msgstr "Discussão entre membros de %1"
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "%1 Mensagens do fórum"
 
-#: ../user/forum_index.php:78
+#: ../user/forum_index.php:83
 msgid ""
 "If you have a question or problem, please use the %1Questions & Answers%2 "
 "section of the message boards."
 msgstr "Se tiver uma questão ou um problema, por favor use a secção %1Questões & Respostas%2 do fórum."
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
 msgstr "Tópicos subscritos"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "Moderar post"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
 msgstr "Esconder post"
 
-#: ../user/forum_moderate_post.php:57 ../user/forum_moderate_thread.php:54
+#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:60
 msgid "Commercial spam"
 msgstr "Spam comercial"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
 msgstr "Duplo post"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "Mover post"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
 msgstr "ID de destino do tópico:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
 msgstr "Banir utilizador"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
 msgstr "Duração do ban"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4 horas"
 
-#: ../user/forum_moderate_post.php:82 ../user/forum_search.php:45
+#: ../user/forum_moderate_post.php:85 ../user/forum_search.php:47
 msgid "1 day"
 msgstr "1 dia"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
 msgstr "1 semana"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "2 semanas"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
 msgstr "1 mês"
 
-#: ../user/forum_moderate_post.php:86
+#: ../user/forum_moderate_post.php:89
 msgid "Forever"
 msgstr "Para sempre"
 
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr "Explicação opcional %1 Incluido no email para o utilizador.%2"
-
-#: ../user/forum_moderate_post.php:101 ../user/forum_moderate_thread.php:91
-#: ../user/forum_post.php:130 ../user/forum_report_post.php:85
-#: ../user/forum_rss.php:55 ../user/friend.php:81 ../user/get_passwd.php:41
-#: ../user/get_passwd.php:75
+#: ../user/forum_moderate_post.php:99 ../user/forum_moderate_post.php:112
+#: ../user/forum_moderate_thread.php:106 ../user/forum_post.php:134
+#: ../user/forum_report_post.php:88 ../user/forum_rss.php:51
+#: ../user/friend.php:83 ../user/get_passwd.php:32 ../user/get_passwd.php:75
 msgid "OK"
 msgstr "OK"
 
-#: ../user/forum_moderate_post_action.php:57
+#: ../user/forum_moderate_post.php:107
+msgid "Optional explanation %1 This is included in email to user.%2"
+msgstr "Explicação opcional %1 Incluido no email para o utilizador.%2"
+
+#: ../user/forum_moderate_post_action.php:60
 msgid "You are not authorized to moderate this post."
 msgstr "Não está autorizado a moderar este post"
 
-#: ../user/forum_moderate_post_action.php:85
+#: ../user/forum_moderate_post_action.php:105
 msgid "Can't move to different category type"
 msgstr "Não é possivel mover para um diferente tipo de categoria"
 
-#: ../user/forum_moderate_post_action.php:89
+#: ../user/forum_moderate_post_action.php:109
 msgid "Can't move to different category"
 msgstr "Não é possivel mover para uma categoria diferente"
 
-#: ../user/forum_moderate_post_action.php:110
+#: ../user/forum_moderate_post_action.php:130
 msgid "Not authorized to banish users"
 msgstr "Não autorizado a utilizadores banidos"
 
-#: ../user/forum_moderate_post_action.php:126
+#: ../user/forum_moderate_post_action.php:146
 msgid "Banishment"
 msgstr "Banimento"
 
-#: ../user/forum_moderate_post_action.php:128
+#: ../user/forum_moderate_post_action.php:148
 msgid "User %1 has been banished."
 msgstr "O utilizador %1 foi banido."
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
 msgstr "Acção falhada: possivel problema na base de dados"
 
-#: ../user/forum_moderate_thread.php:33
+#: ../user/forum_moderate_thread.php:38
 msgid "not authorized"
 msgstr "não autorizado"
 
-#: ../user/forum_moderate_thread.php:36
+#: ../user/forum_moderate_thread.php:41
 msgid "Moderate thread '%1'"
 msgstr "Moderar tópico '%1'"
 
-#: ../user/forum_moderate_thread.php:48
+#: ../user/forum_moderate_thread.php:54
 msgid ""
 "Select the reason category, or write a longer description of why you're "
 "hiding or locking the thread; then press OK."
 msgstr "Seleccione a categoria da razão ou, opcionalmente escreva uma descrição mais detalhada da razão porque está a ocultar o tópico; depois carregue em OK."
 
-#: ../user/forum_moderate_thread.php:72
+#: ../user/forum_moderate_thread.php:78
 msgid "Current forum"
 msgstr "Fórum actual"
 
-#: ../user/forum_moderate_thread.php:73
+#: ../user/forum_moderate_thread.php:79
 msgid "Destination forum"
 msgstr "Descrição do fórum"
 
-#: ../user/forum_moderate_thread.php:77
+#: ../user/forum_moderate_thread.php:83
 msgid "New title:"
 msgstr "Novo título:"
 
-#: ../user/forum_post.php:40
+#: ../user/forum_post.php:44
 msgid ""
 "Only project admins may create a thread here. However, you may reply to "
 "existing threads."
 msgstr "Apenas os administradores do projecto podem criar um tópico aqui. No entanto, pode responder a tópicos existentes."
 
-#: ../user/forum_post.php:60
+#: ../user/forum_post.php:64
 msgid ""
 "Your message was flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "A sua mensagem foi marcada como spam pelo sistema Akismet anti-spam. Por favor, modifique o texto e tente novamente."
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
 msgstr "Criar novo tópico"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
 msgstr "Criar um novo tópico"
 
-#: ../user/forum_post.php:105
+#: ../user/forum_post.php:109
 msgid "Remember to add a title"
 msgstr "Lembrar para adicionar um titulo."
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Show this item as a Notice in the BOINC Manager"
 msgstr "Mostrar este item como Notícia no gestor do BOINC"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Do so only for items likely to be of interest to all volunteers."
 msgstr "Faça-o só para items prováveis de serem de interesse para todos os voluntários."
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
 msgstr "Votação offline"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
 msgstr "Esta funcionalidade está desabilitada pelo projecto"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
 msgstr "Precisa de mais moderação ou totais de créditos para classificar o post."
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
 msgstr "Já classificou este post."
 
-#: ../user/forum_rate.php:62 ../user/forum_rate.php:78
-#: ../user/forum_rate.php:83 ../user/forum_report_post.php:69
-#: ../user/forum_report_post.php:94 ../user/forum_subscribe.php:54
-#: ../user/forum_subscribe.php:69 ../user/forum_thread_status.php:51
+#: ../user/forum_rate.php:64 ../user/forum_rate.php:80
+#: ../user/forum_rate.php:85 ../user/forum_report_post.php:72
+#: ../user/forum_report_post.php:97 ../user/forum_subscribe.php:56
+#: ../user/forum_subscribe.php:71 ../user/forum_thread_status.php:56
 msgid "Return to thread"
 msgstr "Regressar ao tópico"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
 msgstr "Entrada Gravada"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
 msgstr "A sua entrada foi gravada. Obrigado pela sua ajuda."
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
 msgstr "Voto Registado"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
 msgstr "A sua entrada foi gravada. Obrigado pela entrada."
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
 msgstr "Problema na submissão do voto"
 
-#: ../user/forum_reply.php:73
+#: ../user/forum_reply.php:76
 msgid ""
 "Your post has been flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "O seu post foi marcado como spam pelo sistema Akismet anti-spam. Por favor, modifique o texto e tente novamente."
 
-#: ../user/forum_reply.php:88 ../user/forum_thread.php:158
-#: ../user/forum_thread.php:274
+#: ../user/forum_reply.php:91 ../user/forum_thread.php:159
+#: ../user/forum_thread.php:284
 msgid "Post to thread"
 msgstr "Postar no tópico"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "Mensagem:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
 msgstr "responder a %1ID da Mensagem%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
 msgstr "Responder ao post"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
 msgstr "Adicionar a minha assinatura a esta resposta"
 
-#: ../user/forum_report_post.php:45
+#: ../user/forum_report_post.php:48
 msgid "You need more average or total credit to report a post."
 msgstr "Precisa de mais moderação ou totais de créditos para reportar um post."
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "Report Registado"
 
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "O seu report foi gravado. Obrigado pela sua inserção."
 
-#: ../user/forum_report_post.php:67
+#: ../user/forum_report_post.php:70
 msgid ""
 "A moderator will now look at your report and decide what will happen - this "
 "may take a little while, so please be patient"
 msgstr "Um moderador irá ver o seu relatório e decidir o que irá acontecer - isto pode demorar algum tempo, por isso, tenha paciência"
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "Reportar um post do fórum"
 
-#: ../user/forum_report_post.php:73
+#: ../user/forum_report_post.php:76
 msgid ""
 "Before reporting this post, consider using the +/- rating system instead. If"
 " enough users rate a post negatively it will eventually be hidden.<br />You "
 "can find the rating system at the bottom of the post."
 msgstr "Antes de reportar este post, considere usar o sistema de classificação +/-. Se utilizadores suficientes classificarem o post negativamente ele ficará oculto eventualmente.<br>Pode encontrar o sistema de classificação no topo do post."
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "Reportar post"
 
-#: ../user/forum_report_post.php:81
+#: ../user/forum_report_post.php:84
 msgid ""
 "Why do you find the post offensive: %1Please include enough information so that a person that\n"
 "has not yet read the thread will quickly be able to identify the issue.%2"
 msgstr "Porque acha o post ofensico: %1Por favor inclua informação suficiente para que uma pessoa que\nainda não tenha lido o tópico, seja rapidamente capaz de identificar o problema.%2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
 msgstr "Report não registado"
 
-#: ../user/forum_report_post.php:91
+#: ../user/forum_report_post.php:94
 msgid "Your report could not be recorded. Please wait a while and try again."
 msgstr "O seu report não pode ser gravado. Por favor aguarde um bocado e tente novamente."
 
-#: ../user/forum_report_post.php:92
+#: ../user/forum_report_post.php:95
 msgid ""
 "If this is not a temporary error, please report it to the project "
 "developers."
 msgstr "Se não for um erro temporário, por favor reporte-o à equipa de desenvolvimento."
 
-#: ../user/forum_rss.php:41
+#: ../user/forum_rss.php:38
 msgid "%1 RSS feed"
 msgstr "%1 feed RSS"
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
 msgstr "Este fórum está disponivel como um RSS feed."
 
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
 msgstr "Opcões:"
 
-#: ../user/forum_rss.php:47
+#: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
 msgstr "Incluir posts apenas pelo ID de utilizador %1 (padrão: todos os utilizadores)."
 
-#: ../user/forum_rss.php:49
+#: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
 msgstr "Incluir posts apenas dos ultimos %1 dias (padrão: 30)."
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr "Truncar posts: %1 (Incluir apenas os primeiros 265 caracteres de cada post)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
 msgstr "Tópicos apenas: %1 (Incluir apenas o primeiro post de cada tópico)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
 msgstr "Pesquisa no fórum"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "Pesquisa de consulta"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "Procurar por palavras chave:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
 msgstr "Posts contendo todas as palavras especificadas serão mostrados"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
 msgstr "Por exemplo: \"protecção de ecrã bloqueou\""
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "Procurar por ID do autor:"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
 msgstr "Apenas posts deste autor serão mostrados"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
 msgstr "Por exemplo: \"43214\""
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "Opções de pesquisa"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "Limites de pesquisa"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
 msgstr "Pesquisar no máximo até tantos dias atrás"
 
-#: ../user/forum_search.php:50 ../user/forum_search.php:51
+#: ../user/forum_search.php:52 ../user/forum_search.php:53
 msgid "%1 months"
 msgstr "%1 meses"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
 msgstr "1 ano"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "sem limite"
+
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
 msgstr "Apenas mostrar posts deste fórum"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
 msgstr "Começar pesquisa"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
 msgstr "Resultados da pesquisa no fórum"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
 msgstr "Titulos de tópicos correspondentes à sua pesquisa:"
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
 msgstr "Mensagens correspondentes à sua pesquisa:"
 
-#: ../user/forum_search_action.php:217
+#: ../user/forum_search_action.php:219
 msgid ""
 "Sorry, couldn't find anything matching your search query. You can try to "
 "broaden your search by using less words (or less specific words)."
 msgstr "Pedimos desculpa mas, não foi possivel encontrar nada correspondente ao seu critério de pesquisa. Pode tentar ampliar a sua pesquisa usando menos palavras (ou menos palavras especificas)."
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
 msgstr "Pode também %1tentar a mesma pesquisa no Google.%2"
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
 msgstr "realizar outra pesquisa"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
 msgstr "Subscrição bem sucedida"
 
-#: ../user/forum_subscribe.php:49
+#: ../user/forum_subscribe.php:51
 msgid ""
 "You are now subscribed to %1. You will be notified whenever there is a new "
 "post."
 msgstr "Está agora subscrito a %1. Será notificado quando houver um novo post."
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
 msgstr "Subscrição falhada"
 
-#: ../user/forum_subscribe.php:52
+#: ../user/forum_subscribe.php:54
 msgid ""
 "We are currently unable to subscribe you to %1. Please try again later.."
 msgstr "Não é possivel de momento subscrevê-lo a %1. Por favor, tente mais tarde.."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
 msgstr "Subscrição retirada com sucesso"
 
-#: ../user/forum_subscribe.php:64
+#: ../user/forum_subscribe.php:66
 msgid ""
 "You are no longer subscribed to %1. You will no longer receive notifications"
 " for this thread."
 msgstr "Já não está subscrito a %1. Não receberá daqui em diante notificações para este tópico."
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
 msgstr " Retirar subscrição falhada"
 
-#: ../user/forum_subscribe.php:67
+#: ../user/forum_subscribe.php:69
 msgid ""
 "We are currently unable to unsubscribe you from %1. Please try again later.."
 msgstr "Não é possivel de momento retirar a subscrição de %1. Por favor, tente mais tarde.."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
 msgstr "Acção de subscrição desconhecida"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
 msgstr "Este fórum não é visivel a si."
 
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
 msgstr "Este tópico foi oculto pelos moderadores."
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
 msgstr "A minha questão foi respondida"
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
 msgstr "Carregue aqui se a sua questão foi adequadamente respondida"
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
 msgstr "Também tenho esta questão"
 
-#: ../user/forum_thread.php:159 ../user/forum_thread.php:275
+#: ../user/forum_thread.php:160 ../user/forum_thread.php:285
 msgid "Add a new message to this thread"
 msgstr "Adicionar uma nova mensagem a este tópico"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "Deixar de subscrever"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
 msgstr "Já está subscrito neste tópico. Carregue aqui para deixar de subscrever."
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
 msgstr "Subscrever"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
 msgstr "Carregue para obter emails quando houver novos posts neste tópico"
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
 msgstr "Deixar de esconder este tópico"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
 msgstr "Esconder este tópico"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
 msgstr "Marcar como não sticky"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
 msgstr "Marcar este tópico como não sticky"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
 msgstr "Marcar como sticky"
 
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr "Marcar este tópico como sticky"
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "Fazer este tópico aparecer sempre no topo do fórum"
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr "Desbloquear este tópico"
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "Permitir novos posts neste tópico"
 
-#: ../user/forum_thread.php:221
+#: ../user/forum_thread.php:222
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
-msgstr "Bloquear este tópico"
+#: ../user/forum_thread.php:223
+msgid "Don't allow new posts in this thread"
+msgstr "Não permitir novos posts neste tópico"
 
-#: ../user/forum_thread.php:229
+#: ../user/forum_thread.php:230
 msgid "Move this thread to a different forum"
 msgstr "Mover este tópico para um fórum diferente"
 
-#: ../user/forum_thread.php:234
+#: ../user/forum_thread.php:235
 msgid "Edit title"
 msgstr "Editar título"
 
-#: ../user/forum_thread.php:235
+#: ../user/forum_thread.php:236
 msgid "Edit thread title"
 msgstr "Editar o título deste tópico"
 
-#: ../user/forum_thread.php:245
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "Eliminar este tópico permanentemente"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
 msgstr "Exportar como Notícia"
 
-#: ../user/forum_thread.php:251
+#: ../user/forum_thread.php:260
 msgid "Don't export"
 msgstr "Não exportar"
 
-#: ../user/forum_thread.php:252
+#: ../user/forum_thread.php:261
 msgid "Don't export this news item as a Notice"
 msgstr "Não exportar estas novidades como Notícias"
 
-#: ../user/forum_thread.php:260 ../user/forum_thread.php:262
+#: ../user/forum_thread.php:270 ../user/forum_thread.php:272
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../user/forum_thread_status.php:49
+#: ../user/forum_thread_status.php:54
 msgid "Thread status updated"
 msgstr "Estado do tópico actualizado"
 
-#: ../user/forum_thread_status.php:50
+#: ../user/forum_thread_status.php:55
 msgid "The status has been updated."
 msgstr "O estado foi actualizado."
 
-#: ../user/forum_user_posts.php:73
+#: ../user/forum_user_posts.php:75
 msgid "Posts by %1"
 msgstr "Posts por %1"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
 msgstr "Já amigos"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
 msgstr "Solicitou amizade com %1 no %2."
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
 msgstr "Esta solicitação está ainda pendente por confirmação."
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
 msgstr "%1 não está a aceitar pedidos de amizade seus"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
 msgstr "Não pode ser amigo de si mesmo"
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
 msgstr "Adicionar amigo"
 
-#: ../user/friend.php:74
+#: ../user/friend.php:76
 msgid ""
 "You have asked to add %1 as a friend. We will notify %1 and will ask him/her"
 " to confirm that you are friends."
 msgstr "Pediu para adicionar %1 como amigo. Iremos notificar %1 e pedir-lhe que confirme que são amigos."
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
 msgstr "Adicionar uma mensagem opcional aqui:"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
 msgstr "Pedido de amizade enviado"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
 msgstr "Notificámos %1 do seu pedido."
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr "Por favor faça login como %1"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr "Tem que efectuar o login como %1 para ver o pedido deste amigo"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
 msgstr "Pedido de amigo"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
 msgstr "%1 solicitou amizade consigo."
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr "%1 diz: %2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
 msgstr "Aceitar amizade"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
 msgstr "Carregue em aceitar se %1 é de facto um amigo"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
 msgstr "Declinar"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
 msgstr "Carregue em declinar se %1 não é um amigo"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
 msgstr "Amizade confirmada"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
 msgstr "A sua amizade com %1 foi confirmada."
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
 msgstr "Amizade declinada"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
 msgstr "Declinou a amizade com %1"
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
 msgstr "Notificação não encontrada"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
 msgstr "Amigo confirmado"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
 msgstr "É agora amigo de %1."
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
 msgstr "Cancelar amizade?"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
 msgstr "Tem a certeza que quer cancelar a sua amizade com %1?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
 msgstr "Manter amigo"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
 msgstr "Amizade cancelada"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
 msgstr "A sua amizade com %1 foi cancelada."
 
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr "Esqueceu-se das informações da sua conta?"
-
-#: ../user/get_passwd.php:28
+#: ../user/get_passwd.php:27
 msgid ""
 "1) If you know your account's email address, and you can receive email "
 "there:"
 msgstr "1) Se sabe o endereço de email da sua conta e, pode receber os emails nessa conta:"
 
-#: ../user/get_passwd.php:29
+#: ../user/get_passwd.php:28
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
@@ -4417,15 +4453,24 @@ msgstr "Será agora feito o log in na sua conta; actualizar o email e palavra pa
 msgid "Log in with authenticator"
 msgstr "fazer login com o autenticador"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "Esqueceu-se das informações da sua conta?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
 msgstr "Sem tarefas de GPU reportadas"
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "Top de modelos GPU"
+
+#: ../user/gpu_list.php:207
 msgid ""
 "The following lists show the most productive GPU models on different "
-"platforms.  Relative speeds are shown in parentheses."
-msgstr "As seguintes listas mostram os modelos GPU mais productivos nas diferentes plataformas. Velocidades relativas são mostradas em parêntesis."
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "A seguinte lista mostra os modelos de GPU mais produtivas nas diferentes plataformas. Velocidades relativas, analisadas pelo tempo médio das tarefas, são mostradas em parêntesis."
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4439,6 +4484,10 @@ msgstr "Ver e editar as preferências da sua conta usando os links abaixo."
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "Se ainda não o fez, %1faça o download do software de client BOINC%2."
 
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "A sua conta"
+
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
 msgstr "Plataforma anónima, aplicação em falta"
@@ -4553,10 +4602,14 @@ msgstr "sem anfitrião"
 msgid "Merge hosts"
 msgstr "Fundir anfitriões"
 
-#: ../user/host_update_credit.php:28
+#: ../user/host_update_credit.php:27
 msgid "Updating computer credit"
 msgstr "Actualizando créditos do computador"
 
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "Créditos do anfitrião actualizados"
+
 #: ../user/host_venue_action.php:41
 msgid "Host venue updated"
 msgstr "Local do anfitrião actualizado"
@@ -4638,6 +4691,10 @@ msgstr "imagem; altura não pode exceder 450 pixéis. Por favor, não linke imag
 msgid "You can also use ampersand notation for special characters."
 msgstr "Pode também pode usar a notação comercial para caracteres especiais."
 
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "Leia as nossas regras e politícas"
+
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
 msgstr "Executar %1 apenas em computadores autorizados"
@@ -4811,27 +4868,7 @@ msgid ""
 "%1you can provide a translation%2."
 msgstr "As traduções são feitas por voluntários. Se o seu idioma não está aqui, %1 pode providenciar a tradução%2."
 
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "Endereço de email:"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "esqueceu-se do endereço de email?"
-
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr "Palavra passe:"
-
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr "esqueceu-se da palavra passe?"
-
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr "Manter-se logado"
-
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "ou %1criar uma conta%2."
 
@@ -4955,244 +4992,248 @@ msgstr "Não tem mensagens privadas."
 msgid "Sender and date"
 msgstr "Remetente e data"
 
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "Responder a esta mensagem"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "Apagar esta mensagem"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
 msgstr "Seleccionar todos"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
 msgstr "Desseleccione todos"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
 msgstr "Apagar mensagens seleccionadas"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
 msgstr "Remetente"
 
-#: ../user/pm.php:143
+#: ../user/pm.php:148
 msgid "Date"
 msgstr "Data"
 
-#: ../user/pm.php:185
+#: ../user/pm.php:190
 msgid "You need to fill all fields to send a private message"
 msgstr "Tem que preencher todos os campos para enviar uma mensagem privada"
 
-#: ../user/pm.php:188
+#: ../user/pm.php:193
 msgid ""
 "Your message was flagged as spam\n"
 "                by the Akismet anti-spam system.\n"
 "                Please modify your text and try again."
 msgstr "A sua mensagem foi marcada como spam\n              pelo sistema Akismet anti-spam.\n              Por favor, modifique o texto e tente novamente."
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr "Não foi possivel encontrar o utilizador com o id %1"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr "Não foi possivel encontrar o utilizador com o nome de utilizador %1"
 
-#: ../user/pm.php:212
+#: ../user/pm.php:217
 msgid "%1 is not a unique username; you will have to use user ID"
 msgstr "%1 não é um nome de utilizador unico; terá que usar o ID do utilizador"
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
 msgstr "O utilizador %1 (ID: %2) não está a aceitar mensagens privadas suas."
 
-#: ../user/pm.php:240 ../user/view_profile.php:26
+#: ../user/pm.php:245 ../user/view_profile.php:28
 msgid "No such user"
 msgstr "Não existe tal utilizador"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
 msgstr "Bloquear %1?"
 
-#: ../user/pm.php:243
+#: ../user/pm.php:248
 msgid ""
 "Are you really sure you want to block user %1 from sending you private "
 "messages?"
 msgstr "Tem a certeza que quer bloquear o utilizador %1 de lhe enviar mensagens privadas?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
 msgstr "Tenha em atenção que só pode bloquear um número limitado de utilizadores."
 
-#: ../user/pm.php:245
+#: ../user/pm.php:250
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
 msgstr "Assim que o utilizador for bloqueado, só o pode desbloquear usando a página de preferências do fórum."
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
 msgstr "Não, cancelar"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
 msgstr "não existe tal utilizador"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
 msgstr "Utilizador %1 bloqueado"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
 msgstr "O utilizador %1 foi bloqueado de lhe enviar mensagens privadas."
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
 msgstr "Para desbloquear, visite as %1preferências do fórum%2"
 
-#: ../user/pm.php:302
+#: ../user/pm.php:307
 msgid "Unknown action"
 msgstr "Acção desconhecida"
 
-#: ../user/prefs.php:32
+#: ../user/prefs.php:33
 msgid ""
 "Your preferences have been updated, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "As suas preferências foram actualizadas e,\n        terão efeito quando o seu computador comunicar com %1\n        ou executar o comando %2Actualizar%3 a partir do Gestor do BOINC."
 
-#: ../user/prefs.php:41
+#: ../user/prefs.php:42
 msgid ""
 "Your preferences have been reset to the defaults, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "As suas preferências foram redefinidas para as iniciais,\n           e terão efeito quando o seu computador comunicar com %1\n           ou executar o comando %2Actualizar%3 no Gestor BOINC."
 
-#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+#: ../user/prefs_edit.php:66 ../user/prefs_edit.php:94
 msgid "%1 for %2"
 msgstr "%1 para %2"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
 msgstr "Voltar às preferências"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
 msgstr "Confirmar apagar preferências"
 
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:49
 msgid "Are you sure you want to delete your separate %1 preferences for %2?"
 msgstr "Tem a certeza que quer apagar as suas %1preferências separadas para %2?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
 msgstr "Remover preferências"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "Perfis"
+
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
 msgstr "%1Perfis%2 permitem partilhas individuais dos fundos e opiniões com a %3 comunidade."
 
-#: ../user/profile_menu.php:36
+#: ../user/profile_menu.php:38
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
 msgstr "Explore a diversidade dos seus colegas voluntários, e contribua com os seus pontos de vista para que os outros apreciem."
 
-#: ../user/profile_menu.php:37
+#: ../user/profile_menu.php:39
 msgid ""
 "If you haven't already, you can %1create your own user profile%2 for others "
 "to see!"
 msgstr "Se ainda não tem, pode %1criar o seu próprio perfil%2 para que outros possam vê-lo!"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
 msgstr "Utilizador do Dia"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
 msgstr "Explorador do Perfil de Utilizador"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
 msgstr "Ver a %1Galeria de Imagens do Utilizador%2."
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr "Pesquisar os perfis %1por país%2."
 
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:64
 msgid ""
 "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
 "without pictures%2."
 msgstr "Mostrar perfis %1ao acaso%2, %3ao acaso com imagens%2, ou %4ao acaso sem imagens%2."
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
 msgstr "Listagem alfabética de perfis:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
 msgstr "Pesquisar perfil por texto"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
 msgstr "Sem perfis"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
 msgstr "Não existem perfis que correspondam ao seu critério."
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
 msgstr "Tipo de voto inválido:"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
 msgstr "Voto Gravado"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
 msgstr "Obrigado"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
 msgstr "A sua recomendação foi gravada."
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
 msgstr "O seu voto para rejeitar este perfil foi gravado."
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
 msgstr "Regressar ao perfil."
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
 msgstr "Perfis contendo '%1'"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
 msgstr "Nome de utilizador"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
 msgstr "Juntou-se ao projecto"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "Créditos recentes"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
 msgstr "Não encontrou perfis contendo '%1'"
 
@@ -5220,149 +5261,61 @@ msgstr "Utilizador não encontrado ou ID do anfitrião"
 msgid "No tasks to display"
 msgstr "Sem tarefas para mostrar"
 
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr "Em execução"
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "Utilizador do dia"
 
-#: ../user/server_status.php:100
+#: ../user/server_status.php:59
 msgid "Not Running"
 msgstr "Não em execução"
 
-#: ../user/server_status.php:103
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "Em execução"
+
+#: ../user/server_status.php:67
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../user/server_status.php:231
+#: ../user/server_status.php:105
 msgid "Project status"
 msgstr "Estado do projecto"
 
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr "Versão de software do Servidor: %1"
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "Estado do servidor"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Program"
 msgstr "Programa"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Host"
 msgstr "Anfitrião"
 
-#: ../user/server_status.php:252
-msgid "data-driven web pages"
-msgstr "paginas web data-driven"
-
-#: ../user/server_status.php:258
-msgid "upload/download server"
-msgstr "servidor de upload/download"
-
-#: ../user/server_status.php:261
-msgid "scheduler"
-msgstr "agendador"
-
-#: ../user/server_status.php:294
-msgid "Running:"
-msgstr "Em execução:"
-
-#: ../user/server_status.php:295
-msgid "Program is operating normally"
-msgstr "Programa operando normalmente"
-
-#: ../user/server_status.php:296
-msgid "Not Running:"
-msgstr "Não em execução:"
-
-#: ../user/server_status.php:297
-msgid "Program failed or the project is down"
-msgstr "O programa falhou ou está em baixo"
-
-#: ../user/server_status.php:298
-msgid "Disabled:"
-msgstr "Desabilitado:"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "Versão do esquema da Base de Dados:"
 
-#: ../user/server_status.php:299
-msgid "Program is disabled"
-msgstr "O programa está desabilitado"
-
-#: ../user/server_status.php:303
+#: ../user/server_status.php:134
 msgid "Computing status"
 msgstr "Estado da computação"
 
-#: ../user/server_status.php:309
-msgid "The database server is not accessible"
-msgstr "O servidor da base de dados não está acessível"
-
-#: ../user/server_status.php:326
-msgid "Tasks ready to send"
-msgstr "Tarefas prontas para enviar"
-
-#: ../user/server_status.php:331 ../user/workunit.php:55
-msgid "Tasks in progress"
-msgstr "Tarefas em progresso"
-
-#: ../user/server_status.php:336
-msgid "Workunits waiting for validation"
-msgstr "Unidades de trabalho à espera de serem validadas"
-
-#: ../user/server_status.php:341
-msgid "Workunits waiting for assimilation"
-msgstr "Unidades de trabalho à espera de serem assimiladas"
-
-#: ../user/server_status.php:346
-msgid "Workunits waiting for file deletion"
-msgstr "Unidades de trabalho à espera de serem apagadas"
-
-#: ../user/server_status.php:351
-msgid "Tasks waiting for file deletion"
-msgstr "Tarefas à espera de serem apagadas"
-
-#: ../user/server_status.php:367
-msgid "Transitioner backlog (hours)"
-msgstr "Transitioner backlog (horas)"
-
-#: ../user/server_status.php:374
+#: ../user/server_status.php:149
 msgid "Users"
 msgstr "Utilizadores"
 
-#: ../user/server_status.php:377 ../user/server_status.php:395
-msgid "with recent credit"
-msgstr "com crédito recente"
-
-#: ../user/server_status.php:382 ../user/server_status.php:400
-msgid "with credit"
-msgstr "com crédito"
-
-#: ../user/server_status.php:387 ../user/server_status.php:405
-msgid "registered in past 24 hours"
-msgstr "registados nas ultimas 24 horas"
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr "GigaFLOPs actualmente"
-
-#: ../user/server_status.php:420
+#: ../user/server_status.php:161
 msgid "Tasks by application"
 msgstr "Tarefas por aplicação"
 
-#: ../user/server_status.php:423 ../user/workunit.php:40
-msgid "application"
-msgstr "aplicação"
-
-#: ../user/server_status.php:424
-msgid "unsent"
-msgstr "não enviado"
-
-#: ../user/server_status.php:425
-msgid "in progress"
-msgstr "em progresso"
-
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
-msgstr "média de tempo decorrido nos utlimos 100 resultados em h (min-max)"
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "Tempo decorridos das últimas 100 tarefas em horas: média, min, máx"
 
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr "utilizadores nas ultimas 24h"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "Utilizadores nas últimas 24 horas"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5372,679 +5325,701 @@ msgstr "Computador %1"
 msgid "Statistics and leaderboards"
 msgstr "Estatísticas e líderes"
 
-#: ../user/stats.php:28
+#: ../user/stats.php:30
 msgid "Statistics for %1"
 msgstr "Estatísticas para %1"
 
-#: ../user/stats.php:37
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "Top - Participantes"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "Top - Equipas"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "Top - Computadores"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "Modelos de GPU"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "Modelos de CPU"
+
+#: ../user/stats.php:53
 msgid ""
 "More detailed statistics for %1 and other BOINC-based projects are available"
 " at several web sites:"
 msgstr "Mais estatísticas detalhadas para %1 e outros projectos relacionados com o BOINC estão disponíveis em vários websites:"
 
-#: ../user/stats.php:40
+#: ../user/stats.php:56
 msgid ""
 "You can also get your current statistics in the form of a \"signature "
 "image\":"
 msgstr "Pode também obter as suas estatísticas actuais no formato de uma \"signature image\":"
 
-#: ../user/stats.php:43
+#: ../user/stats.php:59
 msgid ""
 "Additionally you can get your individual statistics summed across all BOINC "
 "projects from several sites; see your %1home page%2."
 msgstr "Adicionalmente pode obter as suas estatísticas individuais resumidas através de todos os projectos BOINC de vários sites; veja a sua %1página principal%2."
 
 #: ../user/team.php:27
+msgid "Teams"
+msgstr "Equipas"
+
+#: ../user/team.php:29
 msgid "%1 participants may form %2teams%3."
 msgstr "%1 participantes podem formar %2equipas%3."
 
-#: ../user/team.php:29
+#: ../user/team.php:31
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
 msgstr "Só pode pertencer a uma equipa. Pode juntar-se ou sair duma equipa a qualquer altura."
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
 msgstr "Cada equipa tem um %1fundador%2 que pode:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
 msgstr "aceder aos endereços de email dos membros da equipa"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
 msgstr "editar o nome da equipa e descrição"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
 msgstr "adicionar ou remover administradores da equipa"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
 msgstr "remover membros da equipa"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
 msgstr "acabar com a equipa se esta não tiver membros"
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
 msgstr "Para se juntar a uma equipa, visite a página da equipa e carregue em %1Juntar-se a esta equipa%2."
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
 msgstr "Encontrar uma equipa"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
 msgstr "Todas as equipas"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
 msgstr "%1 equipas"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
 msgstr "Criar uma nova equipa"
 
-#: ../user/team.php:59
+#: ../user/team.php:61
 msgid ""
 "If you cannot find a team that is right for you, you can %1create a team%2."
 msgstr "Se não encontrar uma equipa que seja adequada a si, pode %1criar uma equipa%2."
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
 msgstr "Remover privilégios de administração da equipa deste membro"
 
-#: ../user/team_admins.php:40 ../user/team_admins.php:51
+#: ../user/team_admins.php:42 ../user/team_admins.php:53
 msgid "Add or remove Team Admins"
 msgstr "Adicionar ou remover Administradores da Equipa"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
 msgstr "Pode seleccionar membros como 'Administradores da Equipa'. Administradores da Equipa podem:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "Editar informações da equipa (nome, URL, descrição, país)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
 msgstr "Ver o histórico da equipa de quem se juntou/saiu"
 
-#: ../user/team_admins.php:45
+#: ../user/team_admins.php:47
 msgid ""
 "Moderate the team forum, if any (admins get email notification of moderation"
 " events and red X reports)"
 msgstr "Moderar o fórum da equipa, se existir (administradores recebem notificações por email de eventos de moderação)"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
 msgstr "Administradores da Equipa não podem:"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
 msgstr "Mudar o fundador da equipa"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
 msgstr "Remover membros"
 
-#: ../user/team_admins.php:53
+#: ../user/team_admins.php:55
 msgid "If a Team Admin quits the team, they cease to be a Team Admin."
 msgstr "Se um Administrador da Equipa sair da mesma, deixa de ser um Administrador da Equipa."
 
-#: ../user/team_admins.php:54
+#: ../user/team_admins.php:56
 msgid ""
 "We recommend that you select only people you know and trust very well as "
 "Team Admins."
 msgstr "Recomendados que só seleccione pessoas para Administradores da Equipa que conheça e tenha confiança."
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
 msgstr "Actualmente não existem Administradores da Equipa"
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
 msgstr "Administradores da Equipa Actuais"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
 msgstr "Torne a opção de Administrador da Equipa activada"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
 msgstr "Adicionar Administrador da Equipa"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
 msgstr "Endereço de email do membro da equipa:"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "Adicionar"
+
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
 msgstr "falhou a remoção do administrador"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
 msgstr "O utilizador não é membro da equipa"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
 msgstr "%1 já é um administrador de %2"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
 msgstr "Não foi possivel adicionar administrador"
 
-#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
+#: ../user/team_admins.php:113 ../user/team_manage.php:85
+#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:30
 msgid "No such team"
 msgstr "Não existe essa equipa"
 
-#: ../user/team_change_founder_action.php:30
-#: ../user/team_change_founder_form.php:33 ../user/team_display.php:67
-#: ../user/team_edit_action.php:30 ../user/team_edit_form.php:29
-#: ../user/team_email_list.php:55
+#: ../user/team_change_founder_action.php:32
+#: ../user/team_change_founder_form.php:35 ../user/team_display.php:69
+#: ../user/team_edit_action.php:32 ../user/team_edit_form.php:31
+#: ../user/team_email_list.php:64
 msgid "no such team"
 msgstr "não existe essa equipa"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
 msgstr "O utilizador não é membro de %1"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr "Mudando fundador de %1"
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
 msgstr "%1 é agora fundador de %2"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr "Mudar fundador de %1"
 
-#: ../user/team_change_founder_form.php:43
+#: ../user/team_change_founder_form.php:45
 msgid ""
 "Team member %1 requested this team's foundership on %2, but left the team, "
 "thus canceling the request."
 msgstr "O membro da equipa%1 solicitou a liderança desta equipa em %2, mas deixou a equipa e logo o pedido foi cancelado."
 
-#: ../user/team_change_founder_form.php:49
+#: ../user/team_change_founder_form.php:51
 msgid ""
 "Team member %1 has requested this team's foundership. This may be because "
 "you left the team or haven't had contact with the team for a long time."
 msgstr "O membro da equipa %1 solicitou a liderança desta equipa. Isto poderá ter acontecido porque você deixou a equipa ou não contacta a equipa por um longo periodo de tempo."
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
 msgstr "declinar pedido"
 
-#: ../user/team_change_founder_form.php:58
+#: ../user/team_change_founder_form.php:60
 msgid ""
 "If you don't decline the request by %1, %2 will have the option of assuming team foundership.<br /><br />\n"
 "                  To accept the request, assign foundership to %3 using the form below."
 msgstr "Se não declinar o pedido por %1, 2% terá a opção de assumir a liderança da equipa.<br/><br/>\n                  Para aceitar o pedido, atribua a liderança a %3 usando o formulário abaixo."
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
 msgstr "Não existe pedido de transferência pendente."
 
-#: ../user/team_change_founder_form.php:69
+#: ../user/team_change_founder_form.php:71
 msgid ""
 "To assign foundership of this team to another member, check the box next to "
 "member name and click <strong>Change founder</strong> below."
 msgstr "Para atribuir a liderança desta equipa a outro membro, assinale a caixa a seguir ao membro e clique <strong>Mudar fundador</strong>em baixo."
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
 msgstr "Novo fundador?"
 
-#: ../user/team_change_founder_form.php:105 ../user/team_manage.php:56
+#: ../user/team_change_founder_form.php:107 ../user/team_manage.php:58
 msgid "Change founder"
 msgstr "Mudar fundador"
 
-#: ../user/team_change_founder_form.php:108
+#: ../user/team_change_founder_form.php:110
 msgid "There are no users to transfer team to."
 msgstr "Não existem utilizadores para transferir de equipa."
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
 msgstr "Não pode escolher um nome de equipa em branco"
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
 msgstr "Uma equipa chamada %1 já existe - tente outro nome"
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
 msgstr "Não foi possivel criar a equipa - por favor tente mais tarde."
 
-#: ../user/team_create_form.php:27 ../user/team_create_form.php:32
+#: ../user/team_create_form.php:29 ../user/team_create_form.php:34
 msgid "Create a team"
 msgstr "Criar uma equipa"
 
-#: ../user/team_create_form.php:30
+#: ../user/team_create_form.php:32
 msgid ""
 "You belong to %1. You must %2quit this team%3 before creating a new one."
 msgstr "Pertence a %1. Tem que %2deixar esta equipa%3 antes de criar uma nova."
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
 msgstr "Não é fundador ou administrador"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
 msgstr "Histórico da equipa para %1"
 
-#: ../user/team_delta.php:75
+#: ../user/team_delta.php:76
 msgid "When"
 msgstr "Quando"
 
-#: ../user/team_delta.php:76
+#: ../user/team_delta.php:77
 msgid "User"
 msgstr "Utilizador"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
 msgstr "Acção"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
 msgstr "Créditos totais na altura da acção"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
 msgstr "mau país"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
 msgstr "O nome '%1' já está em uso por outra equipa."
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
 msgstr "Tem que especificar um nome para a equipa"
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
 msgstr "Não foi possivel actualizar a equipa - por favor tente mais tarde."
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
 msgstr "Editar %1"
 
-#: ../user/team_edit_form.php:34
+#: ../user/team_edit_form.php:36
 msgid "Update team info"
 msgstr "Actualizar informações da equipa"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
 msgstr "%1 Lista de Emails"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr "Lista de Membros de %1"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
 msgstr "Mostrar como texto simples"
 
-#: ../user/team_forum.php:28 ../user/team_forum.php:39
+#: ../user/team_forum.php:30 ../user/team_forum.php:41
 msgid "Create Message Board"
 msgstr "Criar Fórum"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
 msgstr "Pode criar um fórum para uso por %1."
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
 msgstr "Apenas membros da equipa podem postar."
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
 msgstr "Por sua opção, apenas membros poderão ler."
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
 msgstr "Você e os Administradores da Equipa terão privilégios de moderação."
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "Criar um fórum para %1"
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
 msgstr "A equipa já tem um fórum"
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
 msgstr "Fórum de Equipa"
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
 msgstr "Tempo minímo entres posts (segundos)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "Total de créditos minímos para postar"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "Média de créditos minímos para postar"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
 msgstr "Submeter"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
 msgstr "Remover o fórum da sua equipa."
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
 msgstr "Tem a certeza que quer remover o fórum?"
 
-#: ../user/team_forum.php:98
+#: ../user/team_forum.php:100
 msgid ""
 "Are you sure you want to remove your team's message board? All threads and "
 "posts will be permanently removed. (You may, however, create a new message "
 "board later)."
 msgstr "Tem a certeza que quer remover o fórum da sua equipa? Todos os tópicos e posts serão permanentemente removidos. (Pode, no entanto, criar um novo fórum mais tarde)."
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
 msgstr "Sim - remover fórum"
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
 msgstr "Fórum removido"
 
-#: ../user/team_forum.php:124
+#: ../user/team_forum.php:126
 msgid ""
 "Your team's message board has been removed. You may now %1create a new "
 "one%2."
 msgstr "O fórum da sua equipa foi removido. Pode agora %1criar um novo%2."
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
 msgstr "Fórum da Equipa Actualizado"
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
 msgstr "Actualização com sucesso"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
 msgstr "Actualização falhada"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "A equipa não tem fórum"
 
-#: ../user/team_founder_transfer_action.php:36
+#: ../user/team_founder_transfer_action.php:38
 msgid "You must be a member of a team to access this page."
 msgstr "Tem que ser um membro de uma equipa para aceder a esta página."
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
 msgstr "Pedindo liderança de %1"
 
-#: ../user/team_founder_transfer_action.php:98
+#: ../user/team_founder_transfer_action.php:100
 msgid ""
 "The current founder has been notified of your request by email and private message.<br /><br />\n"
 "                       If the founder does not respond within 60 days you will be allowed to become the founder."
 msgstr "O fundador actual foi notificado para o seu pedido por email e mensagem privada.<br/><br/>\n                      Se o fundador não responder num prazo de 60 dias, terá permissão para se tornar o fundador."
 
-#: ../user/team_founder_transfer_action.php:102
-#: ../user/team_founder_transfer_action.php:113
+#: ../user/team_founder_transfer_action.php:104
+#: ../user/team_founder_transfer_action.php:115
 msgid "Foundership request not allowed now"
 msgstr "Pedido de liderança não permitido agora"
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
 msgstr "Assumir liderança de %1"
 
-#: ../user/team_founder_transfer_action.php:111
+#: ../user/team_founder_transfer_action.php:113
 msgid ""
 "Congratulations, you are now the founder of team %1. Go to %2Your Account "
 "page%3 to find the Team Admin options."
 msgstr "Parabéns, é agora o fundador da equipa %1. Vá à %2Página da sua Conta%3 para verificar as opções de Administração da Equipa."
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
 msgstr "Declinar pedido de mudança de fundador"
 
-#: ../user/team_founder_transfer_action.php:127
+#: ../user/team_founder_transfer_action.php:129
 msgid "The foundership request from %1 has been declined."
 msgstr "O pedido de liderança de %1 foi declinado."
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
 msgstr "Não existem pedidos de liderança."
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
 msgstr "acção indefinida %1"
 
-#: ../user/team_founder_transfer_action.php:137
-#: ../user/team_founder_transfer_form.php:83
+#: ../user/team_founder_transfer_action.php:139
+#: ../user/team_founder_transfer_form.php:85
 msgid "Return to team page"
 msgstr "Regressar à página da equipa"
 
-#: ../user/team_founder_transfer_form.php:28
+#: ../user/team_founder_transfer_form.php:30
 msgid "You need to be a member of a team to access this page."
 msgstr "Tem que ser um membro duma equipa para aceder a esta página."
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
 msgstr "Solicitar liderança de %1"
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
 msgstr "É agora o fundador da equipa %1."
 
-#: ../user/team_founder_transfer_form.php:44
+#: ../user/team_founder_transfer_form.php:46
 msgid "You requested the foundership of %1 on %2."
 msgstr "Solicitou a liderança de %1 em %2."
 
-#: ../user/team_founder_transfer_form.php:47
+#: ../user/team_founder_transfer_form.php:49
 msgid ""
 "60 days have elapsed since your request, and the founder has not responded. "
 "You may now assume foundership by clicking here:"
 msgstr "60 dias passaram desde o seu pedido e o fundador não respondeu. Pode agora assumir a liderança carregando aqui:"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
 msgstr "Assumir liderança"
 
-#: ../user/team_founder_transfer_form.php:54
+#: ../user/team_founder_transfer_form.php:56
 msgid ""
 "The founder was notified of your request. If he/she does not respond by %1 "
 "you will be given an option to become founder."
 msgstr "O fundador foi notificado do seu pedido. Se ele/ela não responder por %1 ser-lhe-á dada a opção de se tornar fundador."
 
-#: ../user/team_founder_transfer_form.php:60
+#: ../user/team_founder_transfer_form.php:62
 msgid ""
 "If the team founder is not active and you want to assume the role of founder, click the button below. The current founder will be sent an email detailing your request, and will be able to transfer foundership to you or to decline your request. If the founder does not respond in 60 days, you will be allowed to become the founder.<br /><br />\n"
 "                       Are you sure you want to request foundership?"
 msgstr "Se o fundador da equipa não está activo e quiser assumir o papel de fundador, carregue no botão em baixo. Será enviado um email detalhado ao fundador actual com o seu pedido, e o mesmo poderá transferir-lhe a liderança ou declinar o seu pedido. Se o fundador não responder num prazo de 60 dias, terá permissão para se tornar o fundador.<br/><br/>\n                       Tem a certeza que quer solicitar a liderança?"
 
-#: ../user/team_founder_transfer_form.php:65
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
 msgstr "Pedir liderança"
 
-#: ../user/team_founder_transfer_form.php:74
+#: ../user/team_founder_transfer_form.php:76
 msgid "Founder change has already been requested by %1 on %2."
 msgstr "A alteração de fundador já foi solicitada por %1 em %2."
 
-#: ../user/team_founder_transfer_form.php:77
+#: ../user/team_founder_transfer_form.php:79
 msgid ""
 "A foundership change was requested during the last 90 days, so new requests "
 "are not allowed. Please try again later."
 msgstr "Uma mudança de liderança foi solicitada durante os ultimos 90 dias, por isso novos pedidos não são permitidos. Por favor, tente mais tarde."
 
-#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
+#: ../user/team_join.php:34 ../user/team_join_action.php:34
+#: ../user/team_join_form.php:31
 msgid "The team %1 is not joinable."
 msgstr "Não se pode juntar à equipa %1."
 
-#: ../user/team_join.php:35 ../user/team_join_action.php:35
+#: ../user/team_join.php:37 ../user/team_join_action.php:37
 msgid "Already a member"
 msgstr "Já é membro"
 
-#: ../user/team_join.php:36 ../user/team_join_action.php:36
+#: ../user/team_join.php:38 ../user/team_join_action.php:38
 msgid "You are already a member of %1."
 msgstr "Já é membro de %1."
 
-#: ../user/team_join.php:42 ../user/team_join_action.php:43
+#: ../user/team_join.php:44 ../user/team_join_action.php:45
 msgid "Couldn't join team - please try again later."
 msgstr "Não foi possivel se juntar à equipa - por favor tente mais tarde."
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
 msgstr "Juntou-se a %1"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr "Juntou-se a %1."
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr "Juntar %1"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
 msgstr "Por favor tenha atenção:"
 
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:37
 msgid "Joining a team gives its founder access to your email address."
 msgstr "Juntar-se a uma equipa dá ao fundador acesso ao seu endereço de email."
 
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
 msgstr "Juntar-se a uma equipa não afecta os créditos da sua conta."
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
 msgstr "Juntar-se a equipa"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
 msgstr "Resultados da Pesquisa"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
 msgstr "Pesquisar resultados para '%1'"
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
 msgstr "Pode ver os membros, estatísticas e informações das equipas."
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
 msgstr "Mais de 100 equipas correspondem à sua procura. As primeiras 100 serão mostradas."
 
-#: ../user/team_lookup.php:104
+#: ../user/team_lookup.php:106
 msgid ""
 "End of results. %1 If you cannot find the team you are looking for, you may "
 "%2create a team%3 yourself."
 msgstr "Fim dos resultados. %1 Se não conseguiu encontrar a equipa que procurava, pode %2criar uma equipa%3 você mesmo."
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr "Administrador da equipa para %1"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
 msgstr "Editar informações da equipa"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
 msgstr "Mudar nome da equipa, URL, descrição, tipo ou país"
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
 msgstr "Lista de membros:"
 
-#: ../user/team_manage.php:33 ../user/team_manage.php:37
+#: ../user/team_manage.php:35 ../user/team_manage.php:39
 msgid "HTML"
 msgstr "HTML"
 
-#: ../user/team_manage.php:34
+#: ../user/team_manage.php:36
 msgid "text"
 msgstr "texto"
 
-#: ../user/team_manage.php:35
+#: ../user/team_manage.php:37
 msgid "View member names and email addresses"
 msgstr "Ver nomes dos membros e endereços de email"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
 msgstr "Ver histórico de mudanças:"
 
-#: ../user/team_manage.php:38
+#: ../user/team_manage.php:40
 msgid "XML"
 msgstr "XML"
 
-#: ../user/team_manage.php:39
+#: ../user/team_manage.php:41
 msgid "See when members joined or quit this team"
 msgstr "Ver quando os membros se juntaram ou sairam da equipa"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
 msgstr "Responder ao pedido de liderança."
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
 msgstr "Se não responder por %1, %2 pode assumir a liderança desta equipa."
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
 msgstr "Remover membros inactivos ou indesejáveis desta equipa"
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
 msgstr "Transferir liderança para outro membro"
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
 msgstr "Adicionar/remover Administradores da Equipa"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
 msgstr "Dar aos membros seleccionados privilégios de Administração da Equipa"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
 msgstr "Remover equipa"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
 msgstr "Permitido apenas se a equipa não tiver membros"
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
 msgstr "Criar ou gerir um fórum da equipa"
 
-#: ../user/team_manage.php:71
+#: ../user/team_manage.php:73
 msgid ""
 "To have this team created on all BOINC projects (current and future) you can"
 " make it into a %1BOINC-wide team%2."
 msgstr "Para ter esta equipa criada em todos os projectos BOINC (agora e futuramente) pode criá-la numa %1equipa ampla do BOINC%2."
 
-#: ../user/team_manage.php:73
+#: ../user/team_manage.php:75
 msgid ""
 "Team admins are encouraged to join and participate in the Google %1boinc-"
 "team-founders%2 group."
 msgstr "Administradores de Equipa são encorajados a juntar-se e participar no grupo %1fundadores de equipas do boinc%2 no Google."
 
-#: ../user/team_manage.php:75
-msgid ""
-"Other resources for BOINC team admins are available from a third-party site,"
-" %1www.boincteams.com%2."
-msgstr "Outros recursos para Administradores de Equipa do BOINC estão disponíveis num site de terceiros, %1www.boincteams.com%2."
-
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
 msgstr "Não é possivel apagar uma equipa não vazia"
@@ -6053,27 +6028,27 @@ msgstr "Não é possivel apagar uma equipa não vazia"
 msgid "Team %1 deleted"
 msgstr "Equipa %1 apagada"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr "Limite excedido: Só é possivel mostrar os primeiros 1000 membros."
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
 msgstr "Membros de %1"
 
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
 msgid "Unable to quit team"
 msgstr "Não foi possivel sair da equipa"
 
-#: ../user/team_quit_action.php:33
+#: ../user/team_quit_action.php:35
 msgid "Team doesn't exist, or you don't belong to it."
 msgstr "A equipa não existe ou não pertence à mesma."
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
 msgstr "Sair %1"
 
-#: ../user/team_quit_form.php:32
+#: ../user/team_quit_form.php:34
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
@@ -6082,85 +6057,85 @@ msgid ""
 "         </ul>"
 msgstr "<strong>Tenha em atenção antes de sair de uma equipa:</strong>\n         <ul>\n         <li>Se sair de uma equipa, pode mais tarde se juntar novamente, ou juntar-se a outra equipa que deseja\n         <li>Sair de uma equipa não afecta de maneira nenhuma os seus créditos pessoais.\n         </ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
 msgstr "Sair da Equipa"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
 msgstr "Removendo utilizadores de %1"
 
-#: ../user/team_remove_inactive_action.php:39
+#: ../user/team_remove_inactive_action.php:41
 msgid "%1 is not a member of %2"
 msgstr "%1 não é membro de %2"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr "%1 foi removido"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr "Remover membros de %1"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
 msgstr "Remover?"
 
-#: ../user/team_remove_inactive_form.php:40
+#: ../user/team_remove_inactive_form.php:42
 msgid "Name (ID)"
 msgstr "Nome (ID)"
 
-#: ../user/team_remove_inactive_form.php:65
+#: ../user/team_remove_inactive_form.php:67
 msgid "No members are eligible for removal."
 msgstr "Nenhum membro está qualificado para remoção."
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
 msgstr "Remover utilizadores"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
 msgstr "Nome da equipa"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
 msgstr "Resultados da pesquisa de equipas"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
 msgstr "Não foram encontradas equipas correspondentes aos seus critérios de pesquisa. Tenta outra pesquisa."
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
 msgstr "Ou pode %1criar uma nova equipa%2."
 
-#: ../user/team_search.php:100
+#: ../user/team_search.php:121
 msgid ""
 "The following teams match one or more of your search criteria.\n"
 "            To join a team, click its name to go to the team page,\n"
 "               then click %1Join this team%2."
 msgstr "As seguintes equipas correspondem a um ou mais critérios da sua pesquisa.\n           Para se juntar a uma equipa, carregue no seu nome para ir á página da equipa,\n               depois carregue em %1Juntar-se a esta equipa%2."
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
 msgstr "Mudar a sua pesquisa"
 
-#: ../user/team_search.php:181
+#: ../user/team_search.php:202
 msgid ""
 "You can team up with other people with similar interests, or from the same "
 "country, company, or school."
 msgstr "Pode juntar-se com outras pessoas com interesses similares, ou do mesmo país, companhia ou escola."
 
-#: ../user/team_search.php:183
+#: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
 msgstr "Use este formulário para encontrar equipas que possam ser adequadas a si."
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
 msgstr "%1Não estou interessado%2 em juntar-me a uma equipa neste momento."
 
-#: ../user/top_hosts.php:67 ../user/top_teams.php:100
-#: ../user/top_users.php:112
+#: ../user/top_hosts.php:67 ../user/top_teams.php:102
+#: ../user/top_users.php:113
 msgid "Limit exceeded - Sorry, first %1 items only"
 msgstr "Limite excedido - Pedimos desculpa, os primeiros %1 items apenas"
 
@@ -6168,11 +6143,11 @@ msgstr "Limite excedido - Pedimos desculpa, os primeiros %1 items apenas"
 msgid "Top hosts"
 msgstr "Top - Anfitriões"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "Top %1 equipas"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "Não existem %1 equipas"
 
@@ -6180,11 +6155,11 @@ msgstr "Não existem %1 equipas"
 msgid "Participant since"
 msgstr "Participante desde"
 
-#: ../user/uotd.php:29
+#: ../user/uotd.php:31
 msgid "No user of the day has been chosen."
 msgstr "Não foi escolhido utilizador do dia."
 
-#: ../user/uotd.php:33
+#: ../user/uotd.php:35
 msgid "User of the Day for %1: %2"
 msgstr "Uitlizador do Dia para %1: %2"
 
@@ -6228,19 +6203,19 @@ msgstr "Média de créditos por ordem decrescente"
 msgid "Decreasing total credit"
 msgstr "Créditos totais por ordem descrescente"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
 msgstr "pesquisar string que tenha no minímo 3 caracteres"
 
-#: ../user/user_search.php:133
+#: ../user/user_search.php:118
 msgid "User search results"
 msgstr "Resultados da pesquisa de utilizador"
 
-#: ../user/user_search.php:140
+#: ../user/user_search.php:125
 msgid "Joined"
 msgstr "Juntou-se"
 
-#: ../user/user_search.php:148
+#: ../user/user_search.php:133
 msgid "No users match your search criteria."
 msgstr "Nenhum utilizador encontrado com os critérios especificados."
 
@@ -6308,15 +6283,15 @@ msgstr "Validar endereço de email"
 msgid "The email address of your account has been validated."
 msgstr "O endereço de email da sua conta foi validado."
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
 msgstr "Este utilizador não tem perfil"
 
-#: ../user/view_profile.php:54
+#: ../user/view_profile.php:56
 msgid "Profile: %1"
 msgstr "Perfil: %1"
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
 msgstr "Dados da conta"
 
@@ -6370,6 +6345,10 @@ msgstr "não foi possivel encontrar unidade de trabalho"
 msgid "Workunit %1"
 msgstr "Unidade de trabalho %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "aplicação"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "resultado canónico"
@@ -6379,6 +6358,10 @@ msgid "granted credit"
 msgstr "crédito garantido"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "Tarefas em progresso"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "conclusão pendente suprimida"
 
@@ -6406,33 +6389,33 @@ msgstr "validação"
 msgid "Pending"
 msgstr "Pendente"
 
-#: ../project.sample/project.inc:43
+#: ../project.sample/project.inc:70
 msgid "Main page"
 msgstr "Página principal"
 
-#: ../project.sample/project.inc:45
+#: ../project.sample/project.inc:72
 msgid "Copyright"
 msgstr "Direitos de Autor"
 
-#: ../project.sample/project.inc:48
+#: ../project.sample/project.inc:75
 msgid "Generated"
 msgstr "Gerado"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
 msgstr "O seu fundo pessoal."
 
-#: ../project.sample/project.inc:83
+#: ../project.sample/project.inc:110
 msgid ""
 "Tell us about yourself. You could tell us where you're from, your age, "
 "occupation, hobbies, or anything else about yourself."
 msgstr "Fale-nos sobre si. Diga-nos de onde é, a sua idade, ocupação, passatempos ou algos mais sobre si."
 
-#: ../project.sample/project.inc:87
+#: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
 msgstr "As suas opiniões acerca de %1"
 
-#: ../project.sample/project.inc:91
+#: ../project.sample/project.inc:118
 msgid ""
 "Tell us your thoughts about %1<ol>\n"
 "    <li>Why do you run %1?\n"
@@ -6441,24 +6424,35 @@ msgid ""
 "    </ol>"
 msgstr "Diga-nos as suas opiniões acerca %1<ol>\n    <li>Porque executa %1?\n    <li>O seu ponto de vista acerca do projecto?\n    <li>Alguma sugestão?\n    </ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
 msgstr "Esquema de cores para os gráficos"
 
-#: ../project.sample/project_specific_prefs.inc:48
+#: ../project.sample/project_specific_prefs.inc:55
+#, no-php-format
 msgid "Maximum CPU % for graphics%10 ... 100%2"
 msgstr "CPU máximo % para os gráficos%10... 100%2"
 
-#: ../project.sample/project_specific_prefs.inc:49
+#: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
 msgstr "Executar apenas as aplicações seleccionadas"
 
-#: ../project.sample/project_specific_prefs.inc:50
+#: ../project.sample/project_specific_prefs.inc:57
+msgid ""
+"Only get tasks for certain applications. Useful to focus on particular "
+"applications, or to exclude them."
+msgstr "Obter tarefas apenas para certas aplicações. Útil para se focar em aplicações específicas, ou para exclui-las,"
+
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
 msgstr "Se não houver trabalho para as aplicações seleccionadas, aceitar trabalho de outras aplicações?"
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "Utilizar aplicações não-gráficas mais rápidas se disponíveis?"
+
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
 msgstr "(todas as aplicações)"
diff --git a/locale/ro/BOINC-Setup.mo b/locale/ro/BOINC-Setup.mo
index adc9e76..84b0d78 100644
Binary files a/locale/ro/BOINC-Setup.mo and b/locale/ro/BOINC-Setup.mo differ
diff --git a/locale/ro/BOINC-Setup.po b/locale/ro/BOINC-Setup.po
index 999d5fe..a4698db 100644
--- a/locale/ro/BOINC-Setup.po
+++ b/locale/ro/BOINC-Setup.po
@@ -5,11 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-09 00:25+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"PO-Revision-Date: 2015-04-20 12:34+0000\n"
+"Last-Translator: Rom Walton\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/boinc/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/ru/BOINC-Drupal.po b/locale/ru/BOINC-Drupal.po
new file mode 100644
index 0000000..0c82c71
--- /dev/null
+++ b/locale/ru/BOINC-Drupal.po
@@ -0,0 +1,176 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME <EMAIL at ADDRESS>
+# 
+# Translators:
+# Nikolay Sakharov <saharovna at gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"POT-Creation-Date: 2015-04-20 12:14+0000\n"
+"PO-Revision-Date: 2015-04-20 16:59+0000\n"
+"Last-Translator: Nikolay Sakharov <saharovna at gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/boinc/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+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 "Enter the password that accompanies your username."
+msgstr "Введите пароль, соответствующий вашему имени пользователя."
+
+msgid "Request new password"
+msgstr "Запросить новый пароль"
+
+msgid ""
+"If you're already running BOINC, select <i>Add\n"
+"      Project</i>."
+msgstr "Если Вы уже используете BOINC, выберите команду <i>Добавить проект</i>."
+
+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 для командной строки, для создания учётной записи в этом проекте сначала используйте программное обеспечение BOINC Manager (или другое в случае необходимости), а затем используйте эту учётную запись для подключения с помощью версии для командной строки."
+
+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 "Если Вы используете версию BOINC ниже 5.0, выполните обновление до более новой версии для создания учетной записи в этом проекте."
+
+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 "Введите адрес электронной почты и нажмите OK. Вам будут высланы инструкции для сброса вашего пароля."
+
+msgid "OK"
+msgstr "OK"
+
+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 at 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 at Home — это программа, которая, используя время простоя компьютера, запускает заставку для поиска гравитационных волн от быстро вращающихся нейтронных звёзд (также называемых пульсарами) и использует данные, полученные от детектора гравитационных волн LIGO."
+
+msgid "Learn more"
+msgstr "Подробнее"
+
+msgid "View account"
+msgstr "Просмотр учётной записи"
+
+msgid "About our screensaver"
+msgstr "О нашей заставке"
+
+msgid "Over 500,000 volunteers and counting."
+msgstr "Свыше 500 000 добровольцев и больше."
+
+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 "ID пользователя BOINC"
+
+msgid "Drupal user ID"
+msgstr "ID пользователя Drupal"
+
+msgid "Account key"
+msgstr "Ключ учётной записи"
+
+msgid "Weak account key"
+msgstr "Слабый ключ учётной записи"
+
+msgid "Cross-project ID"
+msgstr "Межпроектный ID (CPID)"
+
+msgid "Save changes"
+msgstr "Сохранить изменения"
+
+msgid "Cancel"
+msgstr "Отмена"
+
+msgid "Change password"
+msgstr "Поменять пароль"
+
+msgid "Password"
+msgstr "Пароль"
diff --git a/locale/ru/BOINC-Manager.mo b/locale/ru/BOINC-Manager.mo
index f61b106..6b572d7 100644
Binary files a/locale/ru/BOINC-Manager.mo and b/locale/ru/BOINC-Manager.mo differ
diff --git a/locale/ru/BOINC-Manager.po b/locale/ru/BOINC-Manager.po
index 6b16d0f..d38b4da 100644
--- a/locale/ru/BOINC-Manager.po
+++ b/locale/ru/BOINC-Manager.po
@@ -9,24 +9,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-03-25 14:45+0000\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-26 19:32+0000\n"
 "Last-Translator: Nikolay Sakharov <saharovna at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/boinc/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\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 +176,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 +206,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 "Завершить работу подключенного BOINC клиента..."
 
-#: 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 "Закрыть окно"
 
-#: 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…"
-msgstr "Настройки клиента..."
+#: 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 "Уведомления\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 "Проекты\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 "Задания\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 "Передача\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 "Статистика\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 "Диск\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 "Просмотр событий...\t Ctrl+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 "Упрощенный вид...\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 "Добавить проект или менеджер проектов..."
+#: 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/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "Добавить проект"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "Использовать менеджер проектов..."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "Добавить новый научный проект или менеджер проектов"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "Использовать менеджер проектов для управления этим компьютером."
 
-#: clientgui/AdvancedFrame.cpp:459
+#: clientgui/AdvancedFrame.cpp:461
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "Синхронизироваться с %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 "Добавить проект..."
-
-#: 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..."
 
-#: 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 "Запустить тест производительности"
 
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:492
 msgid "Run tests that measure CPU speed"
 msgstr "Запустить тесты, измеряющие скорость процессора"
 
-#: 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 "Просмотр событий...\t Ctrl+Shift+E"
+
 #: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr "Показать диагностические сообщения"
+
+#: clientgui/AdvancedFrame.cpp:511
 msgid "&Run always"
 msgstr "Постоянная обработка"
 
-#: 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 "График работы определяется настройками"
 
-#: 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 "Приостановить обработку"
 
-#: 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 "Постоянная обработка на ГП"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:548
 msgid "Allow GPU work regardless of preferences"
 msgstr "Обработка заданий на ГП запущена всегда"
 
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:552
 msgid "Use GPU based on preferences"
 msgstr "График работы ГП определяется настройками"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:553
 msgid "Allow GPU work according to preferences"
 msgstr "Обработка на ГП выполняется в соответствии с настройками"
 
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:557
 msgid "Suspend GPU"
 msgstr "Приостановить использование ГП"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:558
 msgid "Stop GPU work regardless of preferences"
 msgstr "Остановить обработку заданий на ГП независимо от настроек"
 
-#: 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 "Запрещается обмен данными через интернет между BOINC и серверами проектов"
 
-#: clientgui/AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
 msgid "Computing &preferences..."
 msgstr "Настройки клиента..."
 
-#: 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 "Другие параметры..."
 
-#: 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"
 
-#: 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"
 
-#: 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..."
 
-#: 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 "Файл"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr "Вид"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:709
 msgid "&Activity"
 msgstr "Управление"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
 msgid "&Options"
 msgstr "Параметры"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
 msgid "&Tools"
 msgstr "Сервис"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr "Справка"
 
-#: 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 +578,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 - Завершение работы текущего BOINC клиента..."
 
-#: 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 +658,9 @@ msgstr "Выйти из %s"
 msgid "%s - Communication"
 msgstr "%s - Установка связи"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -724,6 +733,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 +818,8 @@ msgstr "Владелец %s или права доступа установле
 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 +829,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 менеджер"
 
@@ -870,6 +881,7 @@ msgstr "разрешено несколько экземпляров менед
 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 +904,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 "Приостановить ГП на час"
 
@@ -906,52 +918,55 @@ msgstr "Приостановить ГП на час"
 msgid "E&xit"
 msgstr "Выход"
 
-#: 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 "Запустить ГП"
 
-#: 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 "Обработка на ГП разрешена"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:732
 msgid "GPU computing is suspended - "
 msgstr "Обработка на ГП приостановлена - "
 
-#: 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 +1025,7 @@ msgstr "Обновление %s завершено."
 msgid "Update completed."
 msgstr "Обновление завершено."
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "С данного момента используется менеджер проектов"
@@ -1056,48 +1072,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr "BOINC распространяется под GNU Lesser General Public License версии 3.0."
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr "Посетите"
-
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
-msgstr "для получения дополнительной информации."
+msgid "For more information, visit "
+msgstr "Для получения дополнительной информации посетите "
 
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr "Неверное число"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr "Неверное время. Значение должно быть между 0:00 и 24:00 в формате ЧЧ:ММ"
 
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:771
+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:772
 msgid "Number must be between 0 and 100"
 msgstr "Число должно быть от 0 до 100"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "обнаружено некорректное значение"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 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:1171
 msgid "Confirmation"
 msgstr "Подтверждение"
 
@@ -1106,106 +1122,111 @@ 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Нажмите «Использовать веб-настройки» для использования веб-настроек"
 
-#: 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 "Установите значения и нажмите 'OK' для использования локальных настроек."
 
-#: 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Для сохранения настроек нажмите 'OK'.\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:215
 msgid "Use web prefs"
 msgstr "Использовать веб-настройки"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 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:688
 msgid "Computing"
 msgstr "вычислений"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 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:347
 msgid "OK"
 msgstr "OK"
 
-#: 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:357
 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:471
 msgid "Usage limits"
 msgstr "Ограничения использования"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, no-c-format
 msgid ""
 "Keep some CPUs free for other applications. Example: 75% means use 6 cores "
 "on an 8-core CPU."
 msgstr "Оставлять часть процессоров свободными для других приложений. Например: 75% означает использовать 6 ядер на 8-ядерном процессоре."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr "Использовать не более"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% процессоров"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1213,342 +1234,355 @@ msgid ""
 "and repeat."
 msgstr "Приостанавливать/возобновлять вычисления каждые несколько секунд, чтобы понизить температуру процессора и уменьшить потребляемую энергию. Пример: 75% означает вычислять 3 секунды, подождать 1 секунду и повторить."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% времени ЦП"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr "Когда приостанавливать"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr "Приостановить, когда компьютер работает от аккумулятора"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "Отметьте здесь, чтобы приостановить вычисления на портативных компьютерах при работе от аккумулятора."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr "Приостановить, когда компьютер используется"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "Отметьте здесь, чтобы приостановить вычисления и передачу файлов, когда Вы используете компьютер."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
 msgstr "Приостановить вычисления на ГП, когда компьютер используется"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr "Отметьте здесь, чтобы приостановить вычисления на ГП, когда Вы используете компьютер."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr "Это определяет, когда компьютер считается 'используемым'."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "'Использование' означает ввод с помощью мыши/клавиатуры за последние"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "минут"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "Приостановить, если использование процессора не-%s-задачами выше"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Приостановить, если использование процессора не-BOINC-задачами выше"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "Приостановить вычисления, когда ваш компьютер занят, выполняя другие программы."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr "Другое"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "Поддерживать минимально допустимое количество заданий, чтобы компьютер был занят указанное время"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr "Запасать не менее"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr "дней работы"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:384
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
 msgstr "Поддерживать дополнительное количество заданий выше минимального уровня. Определяет, сколько работы запрашивается при обращении к проекту."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
 msgstr "Запасать дополнительно на"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "Если у Вас работает несколько проектов, то %s может переключаться между ними с указанной периодичностью."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr "Переключение между заданиями каждые"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:427
 msgid ""
 "This controls how often tasks save their state to disk, so that they can be "
 "restarted later."
 msgstr "Эта настройка управляет тем, как часто задания сохраняют на диск своё состояние для того, чтобы они могли позже перезапуститься с этой точки."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
 msgstr "Запрашивать сохранение промежуточных результатов заданий примерно каждые"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr "секунд"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr "Ограничивает скорость загрузки при передаче файлов."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr "Ограничить скорость загрузки"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr "КБ/с"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
 msgstr "Ограничивает скорость отправки при передаче файлов."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr "Ограничить скорость отправки"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr "Пример: %s должен передавать не более 2000 Мб данных каждые 30 дней."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "Limit usage to"
 msgstr "Ограничить использование до"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr "Мб каждые"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr "дней"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, c-format
 msgid ""
 "Check this only if your Internet provider modifies image files. Skipping "
 "verification reduces the security of %s."
 msgstr "Отметьте только в том случае, если ваш интернет-провайдер изменяет файлы изображений. Пропуск проверки уменьшает безопасность %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Skip data verification for image files"
 msgstr "Пропустить проверку данных для файлов изображений"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
 msgstr "Предупреждать перед подключением к сети Интернет"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr "Используется только при наличии модемного, ISDN- или VPN-подключения."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
 msgstr "Разорвать соединение после завершения"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "Диск"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%s будет использовать наиболее строгие из этих параметров:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, 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:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr "Использовать не более"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr "Гб"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, 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:593
 msgid "Leave at least"
 msgstr "Оставлять не менее"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr "Гб свободного места"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, 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:610
 #, no-c-format
 msgid "% of total"
 msgstr "% от полного объема диска"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr "Память"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "Ограничивает память, используемую %s, когда Вы используете компьютер."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 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:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, 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:637
 msgid "When computer is not in use, use at most"
 msgstr "Когда компьютер не используется, использовать не более"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "Оставлять в памяти неактивные задания, которые не используют графический процессор"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:647
 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:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "Ограничивает виртуальную память (файл подкачки), используемую %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr "Виртуальная память/файл подкачки: использовать не более"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr "до"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr "до"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
 msgstr "Вычислять каждый день только во время определённого периода."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr "Вычислять только между"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
 msgstr "По расписанию"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr "Переопределить время в выбранные дни:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr "Понедельник"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr "Пятница"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr "Суббота"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr "Среда"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr "Четверг"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr "Передавать файлы только в конкретный период каждый день."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr "Передавать файлы только между"
 
@@ -1587,15 +1621,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 +1646,7 @@ msgid "Copy &All"
 msgstr "Копировать все"
 
 #: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Копировать все сообщения в буфер обмена."
 
@@ -1616,6 +1655,7 @@ msgid "Copy &Selected"
 msgstr "Копировать выделенное"
 
 #: 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 +1663,7 @@ msgid ""
 msgstr "Копировать выделенные сообщения в буфер обмена. Можно использовать SHIFT и CTRL для выделения нескольких сообщений."
 
 #: 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 +1705,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 +1733,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 +1806,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 "Отмена"
 
@@ -1818,10 +1863,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 +1885,7 @@ msgstr "Имя участника"
 msgid "Team name"
 msgstr "Команда"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "Выделено ресурсов"
 
@@ -1953,11 +2000,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 +2064,8 @@ msgstr "Каталог"
 msgid "Process ID"
 msgstr "ID процесса"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
 msgid "Local: "
 msgstr "Локальное: "
 
@@ -2090,6 +2138,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 +2151,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 +2352,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 +2518,8 @@ msgstr "Проект приостановлен пользователем"
 msgid "Task suspended by user"
 msgstr "Обработка задания приостановлена пользователем"
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Приостановлено - "
@@ -2622,7 +2676,7 @@ msgstr "Выберите понравившийся проект щёлкнув
 msgid "Categories:"
 msgstr "Категории:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Проекты:"
 
@@ -2781,528 +2835,230 @@ msgstr "Автоопределение"
 msgid "SOCKS proxy"
 msgstr "SOCKS прокси"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "Обложка"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Условия использования"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "Выберите внешний вид пользовательского интерфейса."
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Ознакомтесь с условиями использования программы:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "Показать диагностические сообщения."
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Я согласен с условиями."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Полный вид...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Я не согласен с условиями использования."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "Изменить внешний вид на более продвинутый."
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Проект временно недоступен"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "Настройки графического интерфейса программы и прокси серверов"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Проект в данный момент недоступен.\n\nПопробуйте подключиться позже."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Менеджер проектов временно недоступен"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "По умолчанию"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Менеджер проектов в данный момент недоступен.\n\nПопробуйте подключиться позже."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "Приостановить"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Введите учётный ключ для продолжения."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "Приостановить вычисления"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Введен не правильный учётный ключ, повторите ввод ключа"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "Возобновить вычисления"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Ошибка проверки правильности ввода данных"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "Уведомления"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Укажите адрес электронной почты"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Открыть окно просмотра уведомлений проектов и BOINC"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Введен неправильный адрес электронной почты;\nповторите ввод адреса электронной почты"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "Получить справку по %s"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Не указан адрес (URL)"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Получение уведомлений; пожалуйста подождите..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Введите адрес (URL).\nПример:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-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
+msgid "Invalid URL"
+msgstr "Не корректный адрес (URL)"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Закрыть"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Введите корректный адрес (URL).\nПример:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "%s - Уведомления "
+msgid "'%s' does not contain a valid host name."
+msgstr "Компьютер (хост) с именем: '%s' не найден."
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Для дополнительных параметров выберите 'Настройки клиента' в меню 'Полный вид'."
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "Указанный путь: '%s' не существует."
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "ГБ дискового пространства"
+#. 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 "Действия"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - Настройки вычислений"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Копировать все"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "Отменить все локальные настройки и использовать веб-настройки?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Копировать выделенное"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Сообщения проекта"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Показать сообщения только от выбранного проекта."
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Сообщения"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "В буфер обмена копируются все сообщения..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "В буфер обмена копируются выделенные сообщения..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Фильтрация сообщений..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Все сообщения"
+
+#: clientgui/ViewMessages.cpp:495
+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/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
 msgstr "Обновить"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
+#: 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/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "Не запрашивать новые задания с сервера проекта."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "Перезапустить проект"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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 "Удалить ВСЕ файлы и задания выделенного проекта и закачать новые.\nВНИМАНИЕ: не забудьте перед данной операцией отправить все завершенные задания для данного проекта."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
+#: 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/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr "Информация о проекте."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr "Продолжить обработку выделенного проекта."
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "Учётная запись"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "Получать новые задания"
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+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 "Стать участником в любом или во всех 30+ проектах во многих областях науки"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Синхронизация информации о проектах и настройках между BOINC клиентом и менеджером проектов"
-
-#: 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 "BOINC не подключен ни к одному проекту.  Пожалуйста добавьте проект."
-
-#: 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 "Не удалось подключиться к BOINC клиенту"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Условия использования"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Ознакомтесь с условиями использования программы:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Я согласен с условиями."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Я не согласен с условиями использования."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Проект временно недоступен"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "Проект в данный момент недоступен.\n\nПопробуйте подключиться позже."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Менеджер проектов временно недоступен"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "Менеджер проектов в данный момент недоступен.\n\nПопробуйте подключиться позже."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Введите учётный ключ для продолжения."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Введен не правильный учётный ключ, повторите ввод ключа"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Ошибка проверки правильности ввода данных"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Укажите адрес электронной почты"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Введен неправильный адрес электронной почты;\nповторите ввод адреса электронной почты"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Не указан адрес (URL)"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "Введите адрес (URL).\nПример:\nhttp://www.example.com/"
-
-#: 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 "Не корректный адрес (URL)"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "Введите корректный адрес (URL).\nПример:\nhttp://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "Компьютер (хост) с именем: '%s' не найден."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "Указанный путь: '%s' не существует."
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "Действия"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Копировать все"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Копировать выделенное"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Сообщения проекта"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Показать сообщения только от выбранного проекта."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Сообщения"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "В буфер обмена копируются все сообщения..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "В буфер обмена копируются выделенные сообщения..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Фильтрация сообщений..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Все сообщения"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Показать все сообщения."
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "Учётная запись"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "Заработанные очки"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "В среднем за день"
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
+msgstr "В среднем за день"
 
 #: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
@@ -3337,14 +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 "Вы действительно хотите перезапустить проект '%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 "Запрошено пользователем"
@@ -3628,195 +3418,444 @@ msgstr ".\nВы можете включить его, используя мен
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "Повторная попытка передачи данных..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "Повторная попытка передачи данных..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "Прерывание передачи данных с последующим удалением передаваемого файла..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "Вы уверены, что хотите прервать передачу и удалить файл '%s'?\nВНИМАНИЕ: задание, использующее этот файл, будет завершено\nс ошибкой и очки за него будут потеряны."
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "Прерывание передачи файла"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "Отправка"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "Загрузка"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "повторится через "
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "не удалась"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "приостановлена"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "активна"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "ожидает"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr " (запрос к проекту отложен на: "
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "Показать активные задания"
+
+#: 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 "Показать консоль ВМ"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "Показать консоль Виртуальной машины в отдельном окне."
+
+#: clientgui/ViewWork.cpp:233
+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 "Осталось (приблизительно)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "Отправить до"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "Задания"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "Возобновляется обработка ранее приостановленного задания..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "Приостанавливается обработка выделенного задания..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "Открывается окно приложения с графической информацией..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "Открывается консоль Виртуальной машины..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Вы уверены, что хотите прервать обработку выделенного задания '%s'?\n(Прогресс: %s, Состояние: %s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+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 "Прерывание задания..."
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "Показать все задания"
+
+#: clientgui/ViewWork.cpp:859
+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:571
+msgid "Do you really want to cancel?"
+msgstr "Прервать процесс подключения?"
+
+#: clientgui/WizardAttach.cpp:572
+msgid "Question"
+msgstr "Вопрос"
+
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "Pie Ctrl"
+
+#: 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:360
+#, 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:340
+msgid "GB of disk space"
+msgstr "ГБ дискового пространства"
+
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - Настройки вычислений"
+
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "Отменить все локальные настройки и использовать веб-настройки?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Добавить проект"
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "Прерывание передачи данных с последующим удалением передаваемого файла..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Синхронзировать"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "Вы уверены, что хотите прервать передачу и удалить файл '%s'?\nВНИМАНИЕ: задание, использующее этот файл, будет завершено\nс ошибкой и очки за него будут потеряны."
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Для этого проекта работа завершена"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "Прерывание передачи файла"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "Стать участником в любом или во всех 30+ проектах во многих областях науки"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "Отправка"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Синхронизация информации о проектах и настройках между BOINC клиентом и менеджером проектов"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-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/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "повторится через "
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Веб-страницы проекта"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "не удалась"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Команды проекта"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "приостановлена"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Показать меню веб-сайтов для проекта %s"
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
-msgstr "активна"
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Показать меню команд, применимых к проекту %s"
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "ожидает"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "Приостановить это задание."
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr " (запрос к проекту отложен на: "
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Отказаться от этого задания. Вы не получите за него очков."
 
-#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-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/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "Показать только активные задания."
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "BOINC не подключен ни к одному проекту.  Пожалуйста добавьте проект."
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "Показать консоль ВМ"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "Недоступно"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "Показать консоль Виртуальной машины в отдельном окне."
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "Задания:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-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/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Прервать обработку выделенного задания (удалить задание). Очки за прерванные задания не начисляются."
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "От:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "Осталось (приблизительно)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "Прогресс этого задания"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "Отправить до"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "Команды задания"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "Задания"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Показать меню команд, применимых к этому заданию"
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "Возобновляется обработка ранее приостановленного задания..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "Приложение: %s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "Приостанавливается обработка выделенного задания..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "Открывается окно приложения с графической информацией..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "Приложение: недоступно"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "Открывается консоль Виртуальной машины..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "Недоступно"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "Вы уверены, что хотите прервать обработку выделенного задания '%s'?\n(Прогресс: %s, Состояние: %s)"
+msgid "Elapsed: %s"
+msgstr "Затрачено: %s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Вы уверены, что хотите прервать обработку этих %d заданий?"
+msgid "Remaining (estimated): %s"
+msgstr "Осталось (приблизительно): %s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "Прерывание задания..."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "Статус: %s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "Показать все задания"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "Проверка текущего состояния."
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "Показать все задания."
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "Загрузка заданий с сервера проекта."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Добавить проект или менеджер проектов"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Обработка приостановлена:  работа компьютера от батарей."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Добавить проект или менеджер проектов BOINC"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+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 "Добавляйте поекты на сайте\n%s, если это возможно.\n\nПроекты, добавленные с помощью данного\nмастера, не будут управляться через %s."
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "Обработка приостановлена:  по инициативе пользователя."
 
-#: 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 проектов в различных\nобластях науки используют BOINC,\nи Вы можете добровольно помочь любым из них.\nВы можете добавить проект вручную,\nили использовать 'Менеджер Проектов' для выбора."
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "Обработка приостановлена:  запрещённое время суток."
 
-#: 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\nНекоторые из этих проектов запущены и управляются World Community Grid,\nа остальные созданы и управляются другими исследователями и организациями.\nПрограммное обеспечение BOINC может разделить неиспользуемые ресурсы процессора между проектами в любой комбинации.\n\nЛибо, если Вы зарегистрированы в Менеджере проектов BOINC, то можете\nиспользовать его для выбора [...]
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Обработка приостановлена:  запущен тест производительности."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Использовать Менеджер проектов BOINC"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "Обработка приостановлена."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Добавить или изменить свои проекты в World Community Grid"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "Подождите пожалуйста."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Добавить проекты, запущенные другими исследователями или организациями"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "Проверка текущего состояния"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "Прервать процесс подключения?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "Нет заданий для обработки"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-msgstr "Вопрос"
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
+msgstr "Не удалось подключиться к BOINC клиенту"
 
 #: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
@@ -3830,32 +3869,7 @@ msgstr "< Назад"
 msgid "&Finish"
 msgstr "Готово"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
-
-#: 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/locale/ru/BOINC-Project-Generic.po b/locale/ru/BOINC-Project-Generic.po
index 47fdca0..653caec 100644
--- a/locale/ru/BOINC-Project-Generic.po
+++ b/locale/ru/BOINC-Project-Generic.po
@@ -12,14 +12,14 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-03-04 08:56 PST\n"
-"PO-Revision-Date: 2015-03-12 17:53+0000\n"
+"PO-Revision-Date: 2015-05-26 19:33+0000\n"
 "Last-Translator: Nikolay Sakharov <saharovna at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/boinc/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 msgid "LANG_NAME_NATIVE"
diff --git a/locale/ru/BOINC-Setup.mo b/locale/ru/BOINC-Setup.mo
index 969bfdb..be6915c 100644
Binary files a/locale/ru/BOINC-Setup.mo and b/locale/ru/BOINC-Setup.mo differ
diff --git a/locale/ru/BOINC-Setup.po b/locale/ru/BOINC-Setup.po
index bf93e2a..b27e179 100644
--- a/locale/ru/BOINC-Setup.po
+++ b/locale/ru/BOINC-Setup.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-03-12 17:53+0000\n"
+"PO-Revision-Date: 2015-04-20 12:34+0000\n"
 "Last-Translator: Nikolay Sakharov <saharovna at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/boinc/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/ru/BOINC-Web.mo b/locale/ru/BOINC-Web.mo
index 4294c35..55ff57e 100644
Binary files a/locale/ru/BOINC-Web.mo and b/locale/ru/BOINC-Web.mo differ
diff --git a/locale/ru/BOINC-Web.po b/locale/ru/BOINC-Web.po
index 932d023..c6b6ddb 100644
--- a/locale/ru/BOINC-Web.po
+++ b/locale/ru/BOINC-Web.po
@@ -11,14 +11,14 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2015-03-12 17:53+0000\n"
+"PO-Revision-Date: 2015-05-26 19:34+0000\n"
 "Last-Translator: Nikolay Sakharov <saharovna at gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/boinc/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: docutil.php:21
diff --git a/locale/sk/BOINC-Drupal.po b/locale/sk/BOINC-Drupal.po
new file mode 100644
index 0000000..2380897
--- /dev/null
+++ b/locale/sk/BOINC-Drupal.po
@@ -0,0 +1,1519 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME <EMAIL at ADDRESS>
+# 
+# Translators:
+# Michal, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"POT-Creation-Date: 2015-05-07 12:21+0000\n"
+"PO-Revision-Date: 2015-05-26 11:00+0000\n"
+"Last-Translator: Michal\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/boinc/language/sk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, it will be used for your user picture."
+msgstr "Ak máte <a href=\"@gravatar-check\"> platný Gravatar</a> spojený s mailovou adresou, bude použitý ako váš obrázok používateľa."
+
+msgid "Your Gravatar will not be shown if you upload a user picture."
+msgstr "Váš Gravatar nebude zobrazený ak nahráte obrázok používateľa."
+
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, use it for your user picture."
+msgstr "Ak máte <a href=\"@gravatar-check\"> platný Gravatar</a> priradený k mailovej adrese, použite ho ako obrázok používateľa."
+
+msgid "Gravatar will not be shown if an avatar is uploaded."
+msgstr "Váš Gravatar nebude zobrazený ak nahráte obrázok používateľa."
+
+msgid "This is not available until your profile is set up."
+msgstr "Nedostupné kým nebude nastavený profil."
+
+msgid "Should @project show your computers on its web site?"
+msgstr "Môže @projekt zobraziť vaše počítače na svojej stránke?"
+
+msgid "Click here to revoke your membership with @this_team"
+msgstr "Kliknite sem, ak chcete opustiť @tím."
+
+msgid "Minimum avg credit to post"
+msgstr "Minimálny priemerný počet kreditov na posielanie správ"
+
+msgid "Founder & Team Admins have moderator privileges"
+msgstr "Zakladateľ a administrátori tímu majú práva moderátora."
+
+msgid "Notes about changes in foundership:"
+msgstr "Poznámky o zmene zakladateľstva:"
+
+msgid "Foundership can be requested by team members:"
+msgstr "Titul zakladateľa môže byť požadované od členov tímu:"
+
+msgid "One request is allowed at a time"
+msgstr "Naraz je dovolená len jedna žiadosť."
+
+msgid "Any active request must be older than 90 days"
+msgstr "Aktívna žiadosť musí byť staršia ako 90 dní."
+
+msgid "Current founder has 60 days to respond to a request"
+msgstr "Aktuálny zakladateľ má 60 dní na odpoveď na žiadosť."
+
+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 "Ak administrátor tímu tím opustí, prestane byť administrátorom. Odporúčame menovať ľudí, ktorých poznáte a dôverujete im."
+
+msgid "You may create a message board for use by @team"
+msgstr "Môžete vytvoriť nástenku pre @team"
+
+msgid "parent removed"
+msgstr "nadradené odstránené"
+
+msgid "Maximum daily WU quota per CPU"
+msgstr "Maximum denných PJ za deň"
+
+msgid "Received time"
+msgstr "Prijaté"
+
+msgid "App ID"
+msgstr "ID Aplikácie"
+
+msgid "Error mask"
+msgstr "Maska chyby"
+
+msgid "Minimum quorum"
+msgstr "Minimálne quorum"
+
+msgid "Max error tasks"
+msgstr "Maximum chybných úloh"
+
+msgid "Max success tasks"
+msgstr "Maximum úspešných úloh"
+
+msgid "Max total tasks"
+msgstr "Maximum úloh"
+
+msgid "Target number of results"
+msgstr "Cieľový počet úloh"
+
+msgid "Application version ID"
+msgstr "ID verzie aplikácie"
+
+msgid "Plan class"
+msgstr "Trieda plánu"
+
+msgid "Version number"
+msgstr "Verzia"
+
+msgid "App version ID"
+msgstr "ID verzie aplikácie"
+
+msgid "@count million ops/sec"
+msgstr "@count milión operácií za sekundu"
+
+msgid "@rate KiB/sec"
+msgstr "@rate KB/sec"
+
+msgid "@count days"
+msgstr "@count dní"
+
+msgid "@ip_address (same the last @count times)"
+msgstr "@ip_address (rovnaká ako posledných @count krát)"
+
+msgid "commented on"
+msgstr "komentované"
+
+msgid "Remove sticky status from this topic"
+msgstr "Odstrániť status lepkavé z tejto témy"
+
+msgid ""
+"Check the computers that are the same as @name (created on @date at @time "
+"with computer ID @id)"
+msgstr "Skontrolovať počítače, ktoré sú rovnaké ako @name (vytvorené @date o @time s počítačom ID @id)"
+
+msgid "Computer @old_id has been merged successfully into @id."
+msgstr "Počítač @id_old bol úspešne spojený s @id."
+
+msgid "started discussion"
+msgstr "začatá diskusia"
+
+msgid "posted"
+msgstr "poslané"
+
+msgid "Minimum value not met for @field"
+msgstr "Nebola splnená minimálna hodnota pre @pole"
+
+msgid "Invalid data type for @field"
+msgstr "Nesprávne údaje v @field"
+
+msgid ""
+"Authentication is required when changing E-mail address or setting new "
+"password."
+msgstr "Je potrebné sa prihlásiť ak chcete zmeniť mailovú adresu alebo nastaviť nové heslo."
+
+msgid "Request foundership"
+msgstr "Požiadať status zakladateľa"
+
+msgid ""
+"If the team founder is not active and you want to assume the role of "
+"founder, click below to request foundership of @this_team."
+msgstr "Ak zakladateľ tímu nie je aktívny a chcete prevziať status zakladateľa, kliknite nižšie na požiadanie statusu zakladateľa tímu @this_team."
+
+msgid "Initiate request"
+msgstr "Iniciovať žiadosť"
+
+msgid "A BOINC account already exists for @email."
+msgstr "BOINC účet @email už existuje."
+
+msgid ""
+"Please be responsible in what you write and do not create posts which are "
+"offensive or insulting. Offensive posts or threads may be deleted by forum "
+"moderators without warning or discussion. Do not respond to offensive "
+"postings. Click on the \"report\" button at the bottom of the post to call "
+"it to the attention of the moderators."
+msgstr "Prosíme, píšte správy zodpovedne a nevytvárajte nepriateľskú atmosféru. Urážlivé správy alebo témy môžu byť zmazané moderátormi fóra bez predchádzajúceho upozornenia. Neodpovedajte na urážlivé správy; namiesto toho kliknite na tlačidlo \"ohlásiť\" na spodku správu na jej ohlásenie moderátorom."
+
+msgid "this project"
+msgstr "tento projekt"
+
+msgid ""
+"We also ask that you keep all discussion on the message boards related to "
+"@project or BOINC with the small exception of the Science message board "
+"where you are free to discuss anything relevant to the underlying science. "
+"Participants interested in broader discussions should post to unofficial "
+"forums for @project."
+msgstr "Ďalej vás chceme požiadať, aby sa diskusie na nástenke tématicky držali projektu @project alebo BOINC s malou odchýlkou pri vedeckých nástenkách, kde je možné diskutovať na vedecké témy. Účastníci, ktorí majú záujem o všeobecné diskusie môžu diskutovať na neoficiálnych fórach projektvu @project."
+
+msgid "These message boards now support BBCode tags only."
+msgstr "Tieto nástenky podporujú len BBCode tagy."
+
+msgid "Posts contributed"
+msgstr "Správ odoslaných"
+
+msgid "Profile awaiting moderator approval"
+msgstr "Profil čaká na schválenie moderátora"
+
+msgid "Approve profile"
+msgstr "Schváliť profil"
+
+msgid "Approve this profile content"
+msgstr "Schváliť obsah profilu"
+
+msgid "Edit profile"
+msgstr "Upraviť profil"
+
+msgid "Edit the content of this profile"
+msgstr "Upraviť obsah profilu"
+
+msgid "Remove profile"
+msgstr "Odstrániť profil"
+
+msgid "Remove this profile content from the system"
+msgstr "Odstrániť obsah profilu zo systému"
+
+msgid "The team founder has @count days to respond to your transfer request."
+msgstr "Zakladateľ tímu má @count dní na to, aby odpovedal na vašu žiadosť ohľadom prenosu."
+
+msgid "Reject profile"
+msgstr "Odmietnuť profil"
+
+msgid "Reject this profile content"
+msgstr "Odmietnuť obsah tohoto profilu"
+
+msgid "Reason for rejecting this profile"
+msgstr "Dôvod zamietnutia tohoto profilu"
+
+msgid ""
+"This reason will be included in an email to the user. Please write a brief "
+"explanation of the problem and how to fix it."
+msgstr "Dôvod bude priložený v maili užívateľovi. Prosím, napíšte krátke vysvetlenie problému a spôsob ako ho opraviť."
+
+msgid "Submit"
+msgstr "Odoslať"
+
+msgid "project"
+msgstr "projekt"
+
+msgid "Email address"
+msgstr "Mailová adresa"
+
+msgid "Home"
+msgstr "Domov"
+
+msgid "Login"
+msgstr "Prihlásenie"
+
+msgid "search"
+msgstr "vyhľadať"
+
+msgid "Server status"
+msgstr "Stav serveru"
+
+msgid "Language"
+msgstr "Jazyk"
+
+msgid "Enter your @s email address."
+msgstr "Uveďte vašu @s mailovú adresu."
+
+msgid "Join now"
+msgstr "Pridať sa teraz"
+
+msgid "I'm new"
+msgstr "Som tu nový"
+
+msgid "I'm a BOINC user"
+msgstr "Som užívateľ BOINC"
+
+msgid "Welcome back!"
+msgstr "Vitajte späť!"
+
+msgid ""
+"Einstein at 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 at Home je program, ktorý využíva počítač počas jeho nečinnosti na vyhľadávanie gravitačných vĺn z rotujúcich neutrónových hviezd (nazývaných aj pulzary) s využitím údajov z detektoru gravitačných vĺn LIGO."
+
+msgid "Learn more"
+msgstr "Zistiť viac"
+
+msgid "View account"
+msgstr "Zobraziť účet"
+
+msgid "About our screensaver"
+msgstr "O našom šetriči obrazovky"
+
+msgid "Over 500,000 volunteers and counting."
+msgstr "Vyše 500 000 dobrovoľníkov a číslo stále rastie."
+
+msgid "Windows"
+msgstr "Windows"
+
+msgid "Mac"
+msgstr "Mac"
+
+msgid "Linux"
+msgstr "Linux"
+
+msgid "Logout"
+msgstr "Odhlásenie"
+
+msgid "Name"
+msgstr "Názov"
+
+msgid "Avg credit"
+msgstr "Priemerný kredit"
+
+msgid "Total credit"
+msgstr "Celkový kredit"
+
+msgid "Enter your password to save changes"
+msgstr "Na uloženie zmien zadajte heslo."
+
+msgid ""
+"Enter your current password if changing your email\n"
+"          address or password."
+msgstr "Uveďte vaše aktuálne heslo ak meníte mailovú\nadresu alebo heslo."
+
+msgid "BOINC user ID"
+msgstr "Užívateľské ID BOINC"
+
+msgid "Drupal user ID"
+msgstr "Užívateľské ID Drupal"
+
+msgid "Account key"
+msgstr "Kľúč účtu"
+
+msgid "Weak account key"
+msgstr "Slabý kľúč účtu"
+
+msgid "Cross-project ID"
+msgstr "Medziprojektové ID"
+
+msgid "Save changes"
+msgstr "Uložiť zmeny"
+
+msgid "Cancel"
+msgstr "Zrušiť"
+
+msgid "Change password"
+msgstr "Zmeniť heslo"
+
+msgid "What is @this_project?"
+msgstr "Čo je @tento_projekt?"
+
+msgid "no projects..."
+msgstr "žiadne projekty..."
+
+msgid "Download the desktop software"
+msgstr "Stiahnuť aplikáciu na plochu"
+
+msgid "Run the installer"
+msgstr "Spustiť inštaláciu"
+
+msgid "When prompted enter @siteurl"
+msgstr "Pri požiadaní, uveďte @url_stránky"
+
+msgid "Password"
+msgstr "Heslo"
+
+msgid "Enter the password that accompanies your username."
+msgstr "Uveďte heslo k užívateľskému menu."
+
+msgid "Request new password"
+msgstr "Požiadať nové heslo"
+
+msgid ""
+"If you're already running BOINC, select <i>Add\n"
+"      Project</i>."
+msgstr "Ak už používate BOINC, vyberte <i>Pridať\nProjekt</i>."
+
+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 "Pokiaľ používate verziu BOINC na príkazový riadok,\nnajprv spusťte aplikáciu BOINC Manage (ak je to nutné, aj na inom zariadení) na vytvorenie \núčtu na tomto projekte. Potom účet použite na pripojenie sa \ncez príkazový riadok."
+
+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 "Pokiaľ používate verziu BOINC staršiu ako 5.0, prosím\naktualizujte ju na novšiu, aby bolo možné vytvoriť si účet\nna tomto projekte."
+
+msgid ""
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) Ak viete vašu mailovú adresu a môžete na ňu príjmať mail:"
+
+msgid ""
+"Enter the email address and click OK. You will be sent email instructions "
+"for resetting your password."
+msgstr "Uveďte mailovú adresu a kliknite OK. Odošleme vám na ňu inštrukcie ako si resetovať heslo."
+
+msgid "OK"
+msgstr "OK"
+
+msgid "The latest news from the @site_name project"
+msgstr "Posledné správy z projektu @site_name"
+
+msgid "Comment form"
+msgstr "Dotazník na komentár"
+
+msgid "Total credits"
+msgstr "Celkový kredit"
+
+msgid "Recent avg credits"
+msgstr "Nedávny priemerný kredit"
+
+msgid "Country"
+msgstr "Krajina"
+
+msgid "Type"
+msgstr "Typ"
+
+msgid "Founder"
+msgstr "Zakladateľ"
+
+msgid "New members in last day"
+msgstr "Noví členovia zo včerajška"
+
+msgid "Total members"
+msgstr "Počet členov"
+
+msgid "Active members"
+msgstr "Aktívni členovia"
+
+msgid "Members with credit"
+msgstr "Členovia s kreditom"
+
+msgid "Description"
+msgstr "Popis"
+
+msgid "Search teams"
+msgstr "Hľadať tímy"
+
+msgid "Send message"
+msgstr "Poslať správu"
+
+msgid "BOINC"
+msgstr "BOINC"
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Web site"
+msgstr "Stránka"
+
+msgid "No active computers"
+msgstr "Žiadne aktívne počítače"
+
+msgid "This user has no computers that have been active in the last 30 days."
+msgstr "Tento užívateľ nemá žiadne aktívne počítače za posledných 30 dní."
+
+msgid " Default value: @default"
+msgstr "Pôvodná hodnota: @pôvodné"
+
+msgid "Applications"
+msgstr "Aplikácie"
+
+msgid "yes"
+msgstr "áno"
+
+msgid "no"
+msgstr "nie"
+
+msgid "Message @id"
+msgstr "@id správy"
+
+msgid "message @id"
+msgstr "@id správy"
+
+msgid " in response to !parent"
+msgstr "ako odpoveď na !predošlé"
+
+msgid "Credits per day"
+msgstr "Kreditov za deň"
+
+msgid "Computers hidden"
+msgstr "Počítače skryté"
+
+msgid "This user has chosen not to show information about their computers."
+msgstr "Tento užívateľ sa rozhodol nezdieľať informácie o svojich počítačoch."
+
+msgid "Stderr output"
+msgstr "Výstup stderr"
+
+msgid "@time ago"
+msgstr "@pred"
+
+msgid "n/a"
+msgstr "-"
+
+msgid "Submitted by !username on !datetime"
+msgstr "Poslané !užívateľom na !dátum"
+
+msgid "Member since"
+msgstr "Členom od"
+
+msgid "View team"
+msgstr "Zobraziť tím"
+
+msgid "Friends (@count)"
+msgstr "Priatelia (@počet)"
+
+msgid "Website"
+msgstr "Stránka"
+
+msgid "Locked"
+msgstr "Zamknuté"
+
+msgid "Computers pending"
+msgstr "Čaká sa na počítače"
+
+msgid ""
+"This user does not yet have any associated computers. Computers will be "
+"displayed when they have earned their first credits."
+msgstr "Tento užívateľ nemá zatiaľ žiadne priradené počítače. Tie budú zobrazené, keď získa prvé kredity."
+
+msgid "No results found..."
+msgstr "Žiadne výsledky neboli nájdené"
+
+msgid "Background"
+msgstr "Pozadie"
+
+msgid "Teams"
+msgstr "Tímy"
+
+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 "Účastníci projektu @project môžu vytvárať tímy. Môžete byť členom len jedného tímu. Tím môžete kedykoľvek opustiť, alebo sa do nejakého pridať. Aby ste sa pridali do tímu, navštívte jeho stránku a kliknite na \"Pridať sa do tímu\". Každý tím má zakladateľa, ktorý môže:"
+
+msgid "access team members' email addresses"
+msgstr "prístup k mailovým adresám členov tímov"
+
+msgid "edit the team's name and description"
+msgstr "upraviť názov tímu a jeho popis"
+
+msgid "add or remove team admins"
+msgstr "pridať alebo odobrať administrátorov tímu"
+
+msgid "remove members from the team"
+msgstr "odobrať členov z tímu"
+
+msgid "disband a team if it has no members"
+msgstr "rozpustiť tím pokiaľ nemá žiadnych členov"
+
+msgid "Create a new team"
+msgstr "Vytvoriť nový tím"
+
+msgid ""
+"If you cannot find a team that is right for you, you can create a team."
+msgstr "Pokiaľ nenájdete tím, ktorý by bol pre vás ten pravý, môžete tím vytvoríť."
+
+msgid "You must earn @count more credits!"
+msgstr "Potrebujete o @count viac kreditov!"
+
+msgid "Threads"
+msgstr "Vlákna"
+
+msgid "Posts"
+msgstr "Príspevkov"
+
+msgid "Last post"
+msgstr "Posledný príspevok"
+
+msgid "Manage subscriptions"
+msgstr "Spravovať odbery"
+
+msgid "Featured"
+msgstr "Odporúčané"
+
+msgid "Submitted on !datetime"
+msgstr "Poslané !datetime"
+
+msgid "Comments"
+msgstr "Komentáre"
+
+msgid "Opinion"
+msgstr "Názor"
+
+msgid "More"
+msgstr "Viac"
+
+msgid "Tasks"
+msgstr "Úlohy"
+
+msgid "Generic"
+msgstr "Všeobecné"
+
+msgid "Work"
+msgstr "Práca"
+
+msgid "School"
+msgstr "Škola"
+
+msgid "Presets"
+msgstr "Prednastavené"
+
+msgid "Standard"
+msgstr "Štandartné"
+
+msgid "Maximum"
+msgstr "Maximum"
+
+msgid "Green"
+msgstr "Zelená"
+
+msgid "Minimum"
+msgstr "Minimum"
+
+msgid "Custom"
+msgstr "Vlastné"
+
+msgid "Update preset"
+msgstr "Aktualizovať prednastavené"
+
+msgid "Advanced settings"
+msgstr "Pokročilé nastavenia"
+
+msgid "Processor usage"
+msgstr "Utilizare procesor"
+
+msgid "Run while computer is on battery power?"
+msgstr "Spustiť ak je počítač na batériách?"
+
+msgid "Only applies to portable computers"
+msgstr "Len pri prenosných zariadeniach"
+
+msgid "Run while computer is in use?"
+msgstr "Spúšťať ak je počítač používaný"
+
+msgid "Run GPU work while computer is in use?"
+msgstr "Spúšťať prácu pre GPU ak je počítač používaný?"
+
+msgid "Enforced by version @number"
+msgstr "Vynútené verziou @number"
+
+msgid "\"In use\" means mouse/keyboard activity in last"
+msgstr "\"Používa sa\" znamená použitie myši alebo klávesnice za posledných"
+
+msgid "minutes"
+msgstr "minút(y)"
+
+msgid "Suspend work if no mouse/keyboard activity in last"
+msgstr "Pozastaviť keď sa myš alebo klávesnica nepoužili posledných"
+
+msgid "Needed to enter low-power mode on some computers"
+msgstr "Je potrebné prejsť do nizkoenergetického módu na niektorých počítačoch."
+
+msgid "Suspend work if CPU usage is above"
+msgstr "Pozastaviť prácu ak je využitie procesoru nad"
+
+msgid "0 means no restriction. Enforced by version @number"
+msgstr "0 znamená bez obmedzení. Vynútené verziou @number"
+
+msgid "Do work only between the hours of:"
+msgstr "Pracovať len medzi:"
+
+msgid "and"
+msgstr "a"
+
+msgid "No restriction if equal"
+msgstr "Bez obmedzenia ak sa zhoduje"
+
+msgid "Leave tasks in memory while suspended?"
+msgstr "Ponechať aplikácie v pamäti pri ich pozastavení?"
+
+msgid "Suspended tasks will consume swap space if \"yes\""
+msgstr "Pri hodnote \"áno\" budú úlohy využívať odkladací priestor."
+
+msgid "Switch between tasks every"
+msgstr "Prepínať medzi aplikáciami približne každých"
+
+msgid "Recommended: @period minutes"
+msgstr "Odporúčané @period minút"
+
+msgid "On multiprocessors, use at most"
+msgstr "Pe multiprocesor, foloseşte cel mult"
+
+msgid "processors"
+msgstr "procesorov"
+
+msgid "Set to 0 for no limit"
+msgstr "0 znamená bez obmedzení"
+
+msgid "% of the processors"
+msgstr "% din procesoare"
+
+msgid "Use at most"
+msgstr "Použiť najviac"
+
+msgid "% of the CPU time"
+msgstr "% procesorového času"
+
+msgid "Can be used to reduce CPU heat"
+msgstr "Môže sa použiť na zníženie teploty procesoru"
+
+msgid "Disk and memory usage"
+msgstr "Utilizare disc şi memorie"
+
+msgid "Disk: use at most"
+msgstr "Disc: utilizează cel mult"
+
+msgid "Disk: leave free at least"
+msgstr "Disk: ponechať voľných aspoň"
+
+msgid "Values smaller than @number are ignored"
+msgstr "Hodnoty nižšie ako @number sú ignorované"
+
+msgid "% of total"
+msgstr "% celku"
+
+msgid "Tasks checkpoint to disk at most every"
+msgstr "Ukladať stav úloh každých"
+
+msgid "seconds"
+msgstr "sekúnd"
+
+msgid "Swap space: use at most"
+msgstr "Spaţiu swap: foloseşte cel mult"
+
+msgid "Memory: when computer is in use, use at most"
+msgstr "Memorie: când calculatorul este folosit, foloseşte cel mult"
+
+msgid "Memory: when computer is not in use, use at most"
+msgstr "Memorie: când calculatorul nu este folosit, foloseşte cel mult"
+
+msgid "Network usage"
+msgstr "Utilizare reţea"
+
+msgid "Computer is connected to the Internet about every"
+msgstr "Počítač je pripojený k internetu každých"
+
+msgid "days"
+msgstr "dňa (dní)"
+
+msgid ""
+"Leave blank or 0 if always connected. @project will try to maintain at least"
+" this much work."
+msgstr "Nechajte prázdne alebo 0 ak je pripojenie stálé. @project sa pokúsi spracovať aspoň toľko práce."
+
+msgid "Maintain enough work for an additional"
+msgstr "Pripraviť dostatok práce na nasledujúcich"
+
+msgid "Confirm before connecting to Internet?"
+msgstr "Potvrdiť pred pripojením k Internetu"
+
+msgid "Matters only if you have a modem, ISDN, or VPN connection"
+msgstr "Má vplyv len pri pripojení cez modem, ISDN alebo VPN."
+
+msgid "Disconnect when done?"
+msgstr "Odpojiť po skončení?"
+
+msgid "Maximum download rate"
+msgstr "Maximálna rýchlosť sťahovania"
+
+msgid "Maximum upload rate"
+msgstr "Maximálna rýchlosť odosielania"
+
+msgid "Use network only between the hours of:"
+msgstr "Používať sieť len medzi:"
+
+msgid "Transfer at most"
+msgstr "Preniesť najviac"
+
+msgid "Skip image file verification?"
+msgstr "Preskočiť overovanie obrazov?"
+
+msgid ""
+"Check this ONLY if your Internet provider modifies image files (UMTS does "
+"this, for example). Skipping verification reduces the security of BOINC."
+msgstr "Zaškrtnite len ak váš poskytovateľ pripojenia modifikuje súbory. Preskočenie overovaní znižuje bezpečnosť aplikácie BOINC."
+
+msgid "Show comparison view"
+msgstr "Zobraziť porovnanie"
+
+msgid "Resource settings"
+msgstr "Nastavenie zdrojov"
+
+msgid "Resource share"
+msgstr "Podiel výkonu"
+
+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 "Určí akú časť zo zdrojov nastavenú pre tento projekt bude využívať. Napríklad, zúčastnite sa dvoch BOINC projektov s pomerom zdrojov 100 a 200, prvý projekt dostane 1/3 vašich zdrojov a druhý projekt dostane 2/3."
+
+msgid "Use CPU"
+msgstr "Použiť procesoru"
+
+msgid "Use NVIDIA GPU"
+msgstr "Použiť NVIDIA GPU"
+
+msgid "Use ATI GPU"
+msgstr "Použiť ATI GPU"
+
+msgid "Use INTEL GPU"
+msgstr "Použiť INTEL GPU"
+
+msgid "Beta settings"
+msgstr "Nastavenia beta"
+
+msgid "Run test applications?"
+msgstr "Spustiť testovacie aplikácie?"
+
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "Toto nám pomáha pri vývojí aplikácií, no môže spôsobiť zlyhanie úloh na vašom počítači"
+
+msgid "Default set"
+msgstr "Východzie nastavenia"
+
+msgid "Set used for new computers"
+msgstr "Nastaviť pre nové počítače"
+
+msgid "Merge"
+msgstr "Spojiť"
+
+msgid "Delete"
+msgstr "Zmazať"
+
+msgid ""
+"This will delete host @id from your account forever. Are you sure this is "
+"OK?"
+msgstr "Týmto navždy vymažete počítač @id z vášho účtu. Ste si tým istý?"
+
+msgid "Mark all topics read"
+msgstr "Označiť všetky témy ako prečítané"
+
+msgid "Mark all forums read"
+msgstr "Označiť všetky fóra ako prečítané"
+
+msgid ""
+"CAPTCHA validation error: unknown CAPTCHA session ID. Contact the site "
+"administrator if this problem persists."
+msgstr "Chyba overenia CAPTCHA: neznáme ID CAPTCHA relácie. Pokiaľ problém pretrváva, kontaktujte správcu stránky."
+
+msgid "The answer you entered for the CAPTCHA was not correct."
+msgstr "Odpoveď na CAPTCHA bola nesprávna."
+
+msgid "Access denied. You must login to view this page."
+msgstr "Prístup bol zamietnutý. Na zobrazenie obsahu sa prihláste."
+
+msgid "You are not authorized to access this page."
+msgstr "Nemáte oprávnenie na zobrazenie tejto stránky."
+
+msgid "Disable rich-text"
+msgstr "Vypnuť rich-text"
+
+msgid "Enable rich-text"
+msgstr "Zapnúť rich-text"
+
+msgid "View user profile."
+msgstr "Zobraziť profil užívateľa"
+
+msgid "BBcode help"
+msgstr "Pomoc BBcode"
+
+msgid "Post comment"
+msgstr "Odoslať komentár"
+
+msgid "No @type tasks"
+msgstr "Žiadne úlohy @type"
+
+msgid "There are no tasks of this type on record"
+msgstr "V tomto zázname nie sú žiadne úlohy"
+
+msgid "Clear"
+msgstr "Vymazať"
+
+msgid ""
+"This will remove all of your settings from the @name preference set. Are you"
+" sure?"
+msgstr "Týmto odstránite všetky vaše nastavenia z @name . Ste si istý?"
+
+msgid "These apply to all BOINC projects in which you participate."
+msgstr "Acestea se aplică tuturor proiectelor BOINC în care participaţi."
+
+msgid ""
+"On computers attached to multiple projects, the most recently modified "
+"preferences will be used."
+msgstr "Na počítačoch, ktoré sú pripojené k viacerým projektom, bude použitý ten, ktorý bol pozmeneý ako posledný."
+
+msgid "Preferences last modified: @mod_time"
+msgstr "Posledná zmena nastavení: @mod_time"
+
+msgid "Combined preferences"
+msgstr "Kombinované nastavenia"
+
+msgid "Switch View"
+msgstr "Prepnúť vzhľad"
+
+msgid "every"
+msgstr "každých"
+
+msgid "Edit"
+msgstr "Upraviť"
+
+msgid ""
+"This will remove all of your settings from the \"@name\" preference set. Are"
+" you sure?"
+msgstr "Týmto odstránite všetky vaše nastavenia z @name . Ste si istý?"
+
+msgid "Add"
+msgstr "Pridať"
+
+msgid "General settings"
+msgstr "Všeobecné nastavenia"
+
+msgid "Time zone"
+msgstr "Časová zóna"
+
+msgid "Notification settings"
+msgstr "Nastavenia upozornení"
+
+msgid "Receive email notification for private messages?"
+msgstr "Dostávať mailové upozornenia na súkromné správy?"
+
+msgid "Receive email notification for friend requests?"
+msgstr "Informovať mailom o žiadosti o priateľstvo?"
+
+msgid "Language settings"
+msgstr "Nastavenia jazyka"
+
+msgid ""
+"This account's default language for e-mails and preferred language for site "
+"presentation."
+msgstr "Východzí jazyk pre tento účet na maily a preferovaný jazyk na stránky."
+
+msgid "Avatar settings"
+msgstr "Nastavenie avataru"
+
+msgid "Create a profile"
+msgstr "Vytvoriť profil"
+
+msgid "Upload an avatar"
+msgstr "Nahrať avatara"
+
+msgid "Forum settings"
+msgstr "Nastavenia fóra"
+
+msgid "In discussion topics, show at most @comments_per_page"
+msgstr "V diskusiách zobraziť najviac @comments_per_page"
+
+msgid "comments per page"
+msgstr "komentárov na stránku"
+
+msgid "Sort comments in discussions"
+msgstr "Zoradiť komentáre v diskusiách"
+
+msgid "Newest post first"
+msgstr "Od najnovších"
+
+msgid "Oldest post first"
+msgstr "Od najstarších"
+
+msgid "Signature"
+msgstr "Podpis"
+
+msgid "Your signature will be publicly displayed at the end of your comments."
+msgstr "Váš podpis bude zverejnený na konci vašich komentárov."
+
+msgid "Hide signatures in forums"
+msgstr "Skryť podpisy vo fórach"
+
+msgid "Privacy settings"
+msgstr "Nastavenia súkromia"
+
+msgid "Is it OK for @project and your team (if any) to email you?"
+msgstr "Súhlasite aby vám a vášmu teamu @project posielal maily?"
+
+msgid "Hide"
+msgstr "Skryť"
+
+msgid "Hide this topic"
+msgstr "Skryť túto tému"
+
+msgid "Lock"
+msgstr "Zamknúť"
+
+msgid "Lock this thread for comments"
+msgstr "Uzamknúť túto tému"
+
+msgid "Make sticky"
+msgstr "Označiť ako lepkavé"
+
+msgid "Make this topic sticky"
+msgstr "Označiť ako lepkavé"
+
+msgid "moderation"
+msgstr "moderovanie"
+
+msgid "Post new comment"
+msgstr "Poslať novú správu"
+
+msgid "You must earn 1 more credit!"
+msgstr "Potrebujete ešte 1 kredit"
+
+msgid "Joined"
+msgstr "Pridanie sa"
+
+msgid "Credit"
+msgstr "Kredit"
+
+msgid "RAC"
+msgstr "RAC"
+
+msgid "Join team"
+msgstr "Vstúpiť do tímu"
+
+msgid "Click here to become a member of @this_team"
+msgstr "Ak sa chcete stať členom @tohoto tímu, kliknite sem"
+
+msgid "Join this team"
+msgstr "Vstúpiť do tímu"
+
+msgid "Manage team"
+msgstr "Spravovať tím"
+
+msgid "View member list"
+msgstr "Zobraziť členov"
+
+msgid "Member names and emails"
+msgstr "Mená a adresy členov"
+
+msgid "View change history"
+msgstr "Zobraziť históriu zmien"
+
+msgid "See member activity"
+msgstr "Zobraziť činnosť členov"
+
+msgid "Manage team message board"
+msgstr "Spravovať tímovú nástenku"
+
+msgid "Create or manage message board"
+msgstr "Vytvoriť alebo nastaviť nástenku"
+
+msgid "Remove members"
+msgstr "Odobrať členov"
+
+msgid "Change founder"
+msgstr "Zmeniť zakladateľa"
+
+msgid "Manage team admins"
+msgstr "Spravovať administrátorov tímu"
+
+msgid "Edit team info"
+msgstr "Upraviť údaje o tíme"
+
+msgid "Remove team"
+msgstr "Odstrániť tím"
+
+msgid "Team forum"
+msgstr "Tímové fórum"
+
+msgid "A discussion forum has been set up for team members."
+msgstr "Bolo vytvorené fórum pre členov tímu"
+
+msgid "Enter forum"
+msgstr "Vstúpiť do fóra"
+
+msgid "Leave team"
+msgstr "Opustiť fórum"
+
+msgid "Leave this team"
+msgstr "Opustiť tím"
+
+msgid "Edit message board"
+msgstr "Upraviť nástenku"
+
+msgid "Message board title"
+msgstr "Názov nástenky"
+
+msgid "Text only, no HTML tags"
+msgstr "Len text bez HTML tagov"
+
+msgid "Minimum time between posts"
+msgstr "Minimálny čas medzi správami"
+
+msgid "Seconds"
+msgstr "Sekúnd"
+
+msgid "Minimum total credit to post"
+msgstr "Minimálny celkový počet kreditov na posielanie správ"
+
+msgid "Allow public to read board?"
+msgstr "Povoliť verejnosti čítať nástenku?"
+
+msgid "Save message board"
+msgstr "Uložiť nástenku"
+
+msgid "About message boards"
+msgstr "O nástenkách"
+
+msgid "This is a team-only message board"
+msgstr "Toto je nástenka len pre tím"
+
+msgid "Only members may post"
+msgstr "Len členovia môžu posielať správy"
+
+msgid "Only members may read (optional)"
+msgstr "Len členovia môžu čítať (voliteľné)"
+
+msgid "Changing the team founder"
+msgstr "Zmeniť zakladateľa tímu"
+
+msgid "Any member of the team is eligible"
+msgstr "Každý člen tímu môže"
+
+msgid "Current founder becomes a normal user"
+msgstr "Aktuálny zakladateľ sa stane normálnym užívateľom"
+
+msgid "It must be 60 days since any previous request"
+msgstr "Od poslednej žiadosti musí prejst aspoň 60 dní"
+
+msgid "Add team admin"
+msgstr "Pridať administrátora tímu"
+
+msgid "Enter email address"
+msgstr "Uviesť mailovú adresu"
+
+msgid "Current team admins"
+msgstr "Aktuálni administátori tímu"
+
+msgid "About team admins"
+msgstr "O administrátoroch tímu"
+
+msgid "Team admins can:"
+msgstr "Administrátori tímu môžu:"
+
+msgid "Edit team information"
+msgstr "Upraviť údaje o tíme"
+
+msgid "View the team's join / quit history"
+msgstr "Zobraziť údaje o nových/odídených členoch"
+
+msgid "Moderate the team forum"
+msgstr "Moderovať tímové fórum"
+
+msgid "Remove members from the team"
+msgstr "Odstrániť členov z tímu"
+
+msgid "Disband a team if it has no members"
+msgstr "Rozpustiť tím ak nemá žiadnych členov"
+
+msgid "Team admins cannot:"
+msgstr "Administrátori tímu nemôžu:"
+
+msgid "Change the team founder"
+msgstr "Zmeniť zakladateľa tímu"
+
+msgid "Add / Remove team admins"
+msgstr "Pridať / Odstrániť administrátorov tímu"
+
+msgid "Choose type"
+msgstr "Zvoliť typ"
+
+msgid "Team name"
+msgstr "Názov tímu"
+
+msgid "Team name -- HTML version (optional)"
+msgstr "Názov tímu -- HTML verzia (nepovinné)"
+
+msgid "You may use limited HTML tags"
+msgstr "Môžete použiť niektoré HTML tagy"
+
+msgid "Team website (optional)"
+msgstr "Stránka tímu (nepovinné)"
+
+msgid "Displayed on the team's page"
+msgstr "Zobrazené na stránke tímu"
+
+msgid "Type of team"
+msgstr "Typ tímu"
+
+msgid "Accept new members?"
+msgstr "Príjmať nových členov?"
+
+msgid "Description of team"
+msgstr "Popis tímu"
+
+msgid "Create new team"
+msgstr "Vytvoriť nový tím"
+
+msgid "Create a team"
+msgstr "Vytvoriť tím"
+
+msgid "Save team"
+msgstr "Uložit tím"
+
+msgid "Create team message board"
+msgstr "Vytvoriť tímovú nástenku"
+
+msgid "Create message board"
+msgstr "Vytvoriť nástenku"
+
+msgid ""
+"Please set the minimum average credit that a user is required to have in "
+"order to post to this message board."
+msgstr "Prosím, nastavte minimum priemerných kreditov, ktoré sp potrebné pre užívateľa, aby mohol posielať správy na nástenku."
+
+msgid "Post new topic"
+msgstr "Poslať novú tému"
+
+msgid "Anonymous"
+msgstr "Anonymný"
+
+msgid "Unpublished"
+msgstr "Nezverejnené"
+
+msgid "Sorry, unrecognized email address or password."
+msgstr "Nesprávne heslo alebo mailová adresa"
+
+msgid "Have you forgotten your password?"
+msgstr "Zabudli ste heslo?"
+
+msgid "Id"
+msgstr "Id"
+
+msgid "Recent average credit"
+msgstr "Súčasný priemerný kredit"
+
+msgid "Members"
+msgstr "Členovia"
+
+msgid "Total Credit"
+msgstr "Celkový kredit"
+
+msgid "User ID"
+msgstr "Užívateľské ID"
+
+msgid "User"
+msgstr "Používateľ"
+
+msgid "Admin since"
+msgstr "Administrátorom od"
+
+msgid "Team ID"
+msgstr "ID tímu"
+
+msgid "User joined"
+msgstr "Užívateľ sa pridal"
+
+msgid "Timestamp"
+msgstr "Čas"
+
+msgid "Account Key"
+msgstr "Kľúč účtu"
+
+msgid "CPID"
+msgstr "CPID"
+
+msgid "Email Address"
+msgstr "E-mailová adresa"
+
+msgid "Password Hash"
+msgstr "Zakódovanie hesla"
+
+msgid "Postal Code"
+msgstr "PSČ"
+
+msgid "Send Email"
+msgstr "Poslať mail"
+
+msgid "Show Hosts"
+msgstr "Zobraziť zariadenia"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Computer ID"
+msgstr "ID počítača"
+
+msgid "Location"
+msgstr "Umiestnenie"
+
+msgid "While BOINC running, % of time work is allowed"
+msgstr "Când BOINC rulează, % din timp lucrul este permis"
+
+msgid "Average turnaround time"
+msgstr "Priemerná návratová doba "
+
+msgid "Created"
+msgstr "Vytvorený"
+
+msgid "While BOINC running, % of time host has an Internet connection"
+msgstr "Pokým je BOINC spustený, % dĺžka času Internetového spojenia"
+
+msgid "Average CPU efficiency"
+msgstr "Priemerná efektivita procesora"
+
+msgid "Free disk space"
+msgstr "Voľné miesto na disku"
+
+msgid "Total disk space"
+msgstr "Celkový úložný priestor"
+
+msgid "Task duration correction factor"
+msgstr "Korekčný faktor pre dobu výpočtu"
+
+msgid "Avg. credit"
+msgstr "Priemerný kredit"
+
+msgid "External IP address"
+msgstr "Vonkajšia IP adresa"
+
+msgid "Cross project ID"
+msgstr "Medziprojektové ID"
+
+msgid "Last IP address"
+msgstr "Posledná IP adresa"
+
+msgid "Cache"
+msgstr "Vyrovnávacia pamäť"
+
+msgid "Memory"
+msgstr "Pamäť"
+
+msgid "Swap space"
+msgstr "Odkladací priestor"
+
+msgid "Average download rate"
+msgstr "Priemerná rýchlosť sťahovania"
+
+msgid "Average upload rate"
+msgstr "Priemerná rýchlosť odosielania"
+
+msgid "Same IP address count"
+msgstr "Počet rovnakých IP adries"
+
+msgid "% of time BOINC client is running"
+msgstr "Podiel času kedy BOINC beží"
+
+msgid "Operating system"
+msgstr "Operačný systém"
+
+msgid "Operating system version"
+msgstr "Verzia operačného systému"
+
+msgid "Measured floating point speed"
+msgstr "Zmeraná rýchlosť s plávajúcou desatinnou čiarkou"
+
+msgid "Measured integer speed"
+msgstr "Zmeraná celočíselná rýchlosť"
+
+msgid "CPU model"
+msgstr "Model procesoru"
+
+msgid "Number of processors"
+msgstr "Počet procesorov"
+
+msgid "CPU"
+msgstr "Procesor"
+
+msgid "Number of times client has contacted server"
+msgstr "Koľkokrát BOINC klient skontaktoval server"
+
+msgid "Last contact"
+msgstr "Posledný čas kontaktu"
+
+msgid "Serial number"
+msgstr "Sériové číslo"
+
+msgid "Timezone"
+msgstr "Časová zóna"
+
+msgid "Platform ID"
+msgstr "ID Platformy"
+
+msgid "Task ID"
+msgstr "ID úlohy"
+
+msgid "Workunit ID"
+msgstr "ID Pracovnej jednotky"
+
+msgid "Host ID"
+msgstr "ID počítača"
+
+msgid "Application ID"
+msgstr "ID Aplikácie"
+
+msgid "Application version"
+msgstr "Verzia aplikácie"
+
+msgid "Claimed credit"
+msgstr "Získaný kredit"
+
+msgid "Client state"
+msgstr "Stav klienta"
+
+msgid "CPU time"
+msgstr "Procesorový čas"
+
+msgid "Run time"
+msgstr "Čas priebehu"
+
+msgid "Exit status"
+msgstr "Opustiť stav"
+
+msgid "Granted credit"
+msgstr "Udelené kredity"
+
+msgid "Outcome"
+msgstr "Výsledok"
+
+msgid "Report deadline"
+msgstr "Odoslať do"
+
+msgid "Sent"
+msgstr "Poslané"
+
+msgid "Server state"
+msgstr "Stat serveru"
+
+msgid "Stderr out"
+msgstr "Výstup stderr"
+
+msgid "Validation state"
+msgstr "Stav overenia"
+
+msgid "Canonical credit"
+msgstr "Kanonický kredit"
+
+msgid "Canonical result ID"
+msgstr "ID kanonického výsledku"
+
+msgid "Created time"
+msgstr "Vytvorený"
+
+msgid "Needs validation"
+msgstr "Potrebné overiť"
+
+msgid "Initial replication"
+msgstr "Počiatočná replikácia"
+
+msgid "Computer"
+msgstr "Počítač"
+
+msgid "Consecutive valid tasks"
+msgstr "Správne úlohy za sebou"
+
+msgid "Number of tasks completed"
+msgstr "Počet dokončených úloh"
+
+msgid "Max tasks per day"
+msgstr "Maximálny počet úloh za deň"
+
+msgid "Number of tasks today"
+msgstr "Počet úloh za dnes"
+
+msgid "Show IP address"
+msgstr "Zobraziť IP adresu"
+
+msgid "hours"
+msgstr "hodiny"
+
+msgid "Remove friend"
+msgstr "Odstrániť z priateľov"
+
+msgid "Ban user"
+msgstr "Zablokovať užívateľa"
+
+msgid "Add as friend"
+msgstr "Pridať ako priateľa"
+
+msgid "Team"
+msgstr "Tím"
+
+msgid "Reply"
+msgstr "Odpovedať"
+
+msgid "Reply to this comment"
+msgstr "Odpovedať na túto správu"
+
+msgid "Quote"
+msgstr "Citovať"
+
+msgid "Reply to this comment with quote"
+msgstr "Odpovedať na túto správu s citátom"
+
+msgid "Edit this comment"
+msgstr "Upraviť komentár"
+
+msgid "Delete this comment"
+msgstr "Odstrániť komentár"
+
+msgid "Hide this comment"
+msgstr "Skryť komentár"
+
+msgid "Convert"
+msgstr "Konvertovať"
+
+msgid "Convert this comment to a new topic"
+msgstr "Premeniť komentár na novú tému"
+
+msgid "Details"
+msgstr "Detaily"
+
+msgid "Make unsticky"
+msgstr "Zrušiť označenie lepkavé"
+
+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 niekedy chybne pridá rozdielne identity tomu istému počítaču. Dá sa to opraviť spojením starších identít s novšou."
+
+msgid "Remove"
+msgstr "Odobrať"
+
+msgid "hidden"
+msgstr "skryté"
diff --git a/locale/sk/BOINC-Manager.mo b/locale/sk/BOINC-Manager.mo
index 118b17e..cfbad1b 100644
Binary files a/locale/sk/BOINC-Manager.mo and b/locale/sk/BOINC-Manager.mo differ
diff --git a/locale/sk/BOINC-Manager.po b/locale/sk/BOINC-Manager.po
index 5575fe4..e1d7f60 100644
--- a/locale/sk/BOINC-Manager.po
+++ b/locale/sk/BOINC-Manager.po
@@ -9,8 +9,8 @@ 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-03-27 23:03+0000\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-03 20:44+0000\n"
 "Last-Translator: aceman\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/boinc/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 +176,8 @@ msgstr "Otvoriť webstránku"
 msgid "Visit this account manager's web site"
 msgstr "Navštíviť webstránku Správcu konta"
 
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
 #: clientgui/AccountManagerProcessingPage.cpp:186
 #: clientgui/AccountManagerPropertiesPage.cpp:192
 #, c-format
@@ -204,364 +206,369 @@ msgstr "Pripojené"
 msgid "Disconnected"
 msgstr "Odpojené"
 
-#: clientgui/AdvancedFrame.cpp:325
+#: clientgui/AdvancedFrame.cpp:327
 #, c-format
 msgid "New %s window..."
 msgstr "Nové okno %s..."
 
-#: clientgui/AdvancedFrame.cpp:329
+#: clientgui/AdvancedFrame.cpp:331
 #, c-format
 msgid "Open another %s window"
 msgstr "Otvoriť ďalšie okno %s"
 
-#: clientgui/AdvancedFrame.cpp:340
+#: clientgui/AdvancedFrame.cpp:342
 msgid "Select computer..."
 msgstr "Vybrať počítač..."
 
-#: clientgui/AdvancedFrame.cpp:341
+#: clientgui/AdvancedFrame.cpp:343
 msgid "Connect to a BOINC client on another computer"
 msgstr "Pripojiť k BOINC klientovi na inom počítači"
 
-#: clientgui/AdvancedFrame.cpp:345
+#: clientgui/AdvancedFrame.cpp:347
 msgid "Shut down connected client..."
 msgstr "Vypnúť pripojeného klienta..."
 
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:348
 msgid "Shut down the currently connected BOINC client"
 msgstr "Vypnúť aktuálne pripojeného klienta BOINC"
 
-#: clientgui/AdvancedFrame.cpp:351
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
 #, c-format
 msgid "Close the %s window"
 msgstr "Zavrieť okno %s"
 
-#: clientgui/AdvancedFrame.cpp:354
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
 msgid "&Close window"
 msgstr "&Zavrieť okno"
 
-#: 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 "Ukončiť %s"
 
-#: clientgui/AdvancedFrame.cpp:386
-msgid "Preferences…"
-msgstr "Preferencie…"
+#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+msgid "Preferences..."
+msgstr "Preferencie..."
 
-#: clientgui/AdvancedFrame.cpp:395
+#: clientgui/AdvancedFrame.cpp:398
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Oznamy\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:396
+#: clientgui/AdvancedFrame.cpp:399
 msgid "Show notices"
 msgstr "Zobraziť oznamy"
 
-#: clientgui/AdvancedFrame.cpp:401
+#: clientgui/AdvancedFrame.cpp:404
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekty\t Ctrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:402
+#: clientgui/AdvancedFrame.cpp:405
 msgid "Show projects"
 msgstr "Zobraziť projekty"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: clientgui/AdvancedFrame.cpp:410
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "Ú&lohy\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:408
+#: clientgui/AdvancedFrame.cpp:411
 msgid "Show tasks"
 msgstr "Zobraziť úlohy"
 
-#: clientgui/AdvancedFrame.cpp:413
+#: clientgui/AdvancedFrame.cpp:416
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "P&renosy\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:414
+#: clientgui/AdvancedFrame.cpp:417
 msgid "Show file transfers"
 msgstr "Zobraziť prenosy"
 
-#: clientgui/AdvancedFrame.cpp:419
+#: clientgui/AdvancedFrame.cpp:422
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "Š&tatistiky\t Ctrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:420
+#: clientgui/AdvancedFrame.cpp:423
 msgid "Show statistics"
 msgstr "Zobraziť štatistiky"
 
-#: clientgui/AdvancedFrame.cpp:425
+#: clientgui/AdvancedFrame.cpp:428
 msgid "&Disk\tCtrl+Shift+D"
 msgstr "&Disk\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:429
 msgid "Show disk usage"
 msgstr "Zobraziť využitie disku"
 
-#: clientgui/AdvancedFrame.cpp:432
-msgid "Event Log...\tCtrl+Shift+E"
-msgstr "Záznam udalostí...\tCtrl+Shift+E"
-
-#: clientgui/AdvancedFrame.cpp:433
-msgid "Show diagnostic messages"
-msgstr "Zobraziť diagnostické správy."
-
-#: clientgui/AdvancedFrame.cpp:439
+#: clientgui/AdvancedFrame.cpp:436
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Jednoduché &zobrazenie...\t Ctrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:437
 msgid "Switch to the Simple View"
 msgstr "Prepnúť na zjednodušený vzhľad"
 
-#: clientgui/AdvancedFrame.cpp:454
-msgid "&Add project or account manager..."
-msgstr "P&ripojiť k projektu alebo Správcovi konta..."
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
+msgstr "P&ripojiť k projektu..."
+
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "Pripojiť k projektu"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "Po&užiť správcu konta..."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "Pripojiť projekt alebo použiť Správcu účtu"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "Použiť správcu konta, ktorý bude ovládať tento počítač."
 
-#: clientgui/AdvancedFrame.cpp:459
+#: clientgui/AdvancedFrame.cpp:461
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synchronizovať s %s"
 
-#: clientgui/AdvancedFrame.cpp:463
+#: clientgui/AdvancedFrame.cpp:465
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Získať aktuálne nastavenia z %s"
 
-#: clientgui/AdvancedFrame.cpp:473
-msgid "&Add project..."
-msgstr "P&ripojiť k projektu..."
-
-#: clientgui/AdvancedFrame.cpp:474
-msgid "Add a project"
-msgstr "Pripojiť k projektu"
-
-#: clientgui/AdvancedFrame.cpp:477
+#: clientgui/AdvancedFrame.cpp:479
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Ukončiť používanie %s..."
 
-#: clientgui/AdvancedFrame.cpp:483
+#: clientgui/AdvancedFrame.cpp:485
 msgid "Remove this computer from account manager control."
 msgstr "Odstrániť počítač z ovládania Správcom konta."
 
-#: clientgui/AdvancedFrame.cpp:489
+#: clientgui/AdvancedFrame.cpp:491
 msgid "Run CPU &benchmarks"
 msgstr "Spustiť &testy CPU"
 
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:492
 msgid "Run tests that measure CPU speed"
 msgstr "Spustiť testy na zmeranie rýchlosti CPU"
 
-#: clientgui/AdvancedFrame.cpp:494
+#: clientgui/AdvancedFrame.cpp:496
 msgid "Retry pending transfers"
 msgstr "Zopakovať čakajúce prenosy"
 
-#: clientgui/AdvancedFrame.cpp:495
+#: clientgui/AdvancedFrame.cpp:497
 msgid "Retry deferred file transfers and task requests"
 msgstr "Zopakovať odložené prenosy súborov a požiadavky na úlohy."
 
+#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "Záznam udalostí...\tCtrl+Shift+E"
+
 #: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr "Zobraziť diagnostické správy."
+
+#: clientgui/AdvancedFrame.cpp:511
 msgid "&Run always"
 msgstr "&Počítať stále"
 
-#: clientgui/AdvancedFrame.cpp:504
+#: clientgui/AdvancedFrame.cpp:512
 msgid "Allow work regardless of preferences"
 msgstr "Povoliť prácu bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:508
+#: clientgui/AdvancedFrame.cpp:516
 msgid "Run based on &preferences"
 msgstr "P&očítať podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:517
 msgid "Allow work according to preferences"
 msgstr "Povoliť prácu podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:513
+#: clientgui/AdvancedFrame.cpp:521
 msgid "&Suspend"
 msgstr "Po&zastaviť"
 
-#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/AdvancedFrame.cpp:522
 msgid "Stop work regardless of preferences"
 msgstr "Zastaví prácu bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:539
+#: clientgui/AdvancedFrame.cpp:547
 msgid "Use GPU always"
 msgstr "Vždy používať GPU"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:548
 msgid "Allow GPU work regardless of preferences"
 msgstr "Povoliť prácu na GPU bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:552
 msgid "Use GPU based on preferences"
 msgstr "Počítať na GPU podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:553
 msgid "Allow GPU work according to preferences"
 msgstr "Povoliť prácu na GPU podľa Vašich preferencií"
 
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:557
 msgid "Suspend GPU"
 msgstr "Pozastaviť GPU"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:558
 msgid "Stop GPU work regardless of preferences"
 msgstr "Zastaviť prácu na GPU bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:574
+#: clientgui/AdvancedFrame.cpp:582
 msgid "Network activity always allowed"
 msgstr "Sieťové aktivity vždy povolené"
 
-#: clientgui/AdvancedFrame.cpp:575
+#: clientgui/AdvancedFrame.cpp:583
 msgid "Allow network activity regardless of preferences"
 msgstr "Povoliť sieťové aktivity bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:579
+#: clientgui/AdvancedFrame.cpp:587
 msgid "Network activity based on preferences"
 msgstr "Sieťové aktivity podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:580
+#: clientgui/AdvancedFrame.cpp:588
 msgid "Allow network activity according to preferences"
 msgstr "Povoliť sieťové aktivity v súlade s Vašimi preferenciami"
 
-#: clientgui/AdvancedFrame.cpp:584
+#: clientgui/AdvancedFrame.cpp:592
 msgid "Network activity suspended"
 msgstr "Sieťové aktivity pozastavené"
 
-#: clientgui/AdvancedFrame.cpp:585
+#: clientgui/AdvancedFrame.cpp:593
 msgid "Stop BOINC network activity"
 msgstr "Zastaviť sieťové aktivity pre BOINC"
 
-#: clientgui/AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
 msgid "Computing &preferences..."
 msgstr "&Preferencie počítania..."
 
-#: clientgui/AdvancedFrame.cpp:595
+#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
 msgid "Configure computing preferences"
 msgstr "Konfigurovať preferencie počítania"
 
-#: clientgui/AdvancedFrame.cpp:600
+#: clientgui/AdvancedFrame.cpp:608
 msgid "Exclusive applications..."
 msgstr "Výhradné aplikácie..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: clientgui/AdvancedFrame.cpp:609
 msgid "Configure exclusive applications"
 msgstr "Nastaviť výhradné aplikácie"
 
-#: clientgui/AdvancedFrame.cpp:606
+#: clientgui/AdvancedFrame.cpp:614
 msgid "Select columns..."
 msgstr "Vybrať stĺpce..."
 
-#: clientgui/AdvancedFrame.cpp:607
+#: clientgui/AdvancedFrame.cpp:615
 msgid "Select which columns to display"
 msgstr "Vybrať stĺpce na zobrazenie"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: clientgui/AdvancedFrame.cpp:619
 msgid "Event Log options...\tCtrl+Shift+F"
 msgstr "Nastavenia záznamu udalostí...⇥Ctrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: clientgui/AdvancedFrame.cpp:620
 msgid "Enable or disable various diagnostic messages"
 msgstr "Povoliť alebo zakázať rôzne diagnostické správy"
 
-#: clientgui/AdvancedFrame.cpp:616
+#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
 msgid "&Other options..."
 msgstr "&Ďalšie nastavenia..."
 
-#: clientgui/AdvancedFrame.cpp:617
+#: clientgui/AdvancedFrame.cpp:625
 msgid "Configure display options and network settings"
 msgstr "Nastaviť obrazovku a sieť"
 
-#: clientgui/AdvancedFrame.cpp:622
+#: clientgui/AdvancedFrame.cpp:630
 msgid "Read config files"
 msgstr "Načítať konfiguračné súbory"
 
-#: clientgui/AdvancedFrame.cpp:623
+#: clientgui/AdvancedFrame.cpp:631
 msgid ""
 "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "Načítať konfiguráciu zo súborov cc_config.xml a app_config.xml"
 
-#: clientgui/AdvancedFrame.cpp:627
+#: clientgui/AdvancedFrame.cpp:635
 msgid "Read local prefs file"
 msgstr "Načítať súbor lokálnych preferencií"
 
-#: clientgui/AdvancedFrame.cpp:628
+#: clientgui/AdvancedFrame.cpp:636
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Načítať preferencie z global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
 #, c-format
 msgid "%s &help"
 msgstr "P&omoc s %s"
 
-#: clientgui/AdvancedFrame.cpp:640
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
 #, c-format
 msgid "Show information about %s"
 msgstr "Zobraziť informácie o %s"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:658
 #, c-format
 msgid "&%s help"
 msgstr "Pomoc s &%s"
 
-#: clientgui/AdvancedFrame.cpp:654
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
 msgid "Show information about the %s"
 msgstr "Zobraziť informácie o %s"
 
-#: clientgui/AdvancedFrame.cpp:665
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
 #, c-format
 msgid "%s &web site"
 msgstr "&Webstránka %s"
 
-#: clientgui/AdvancedFrame.cpp:669
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Zobraziť informácie o BOINC a %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 "&O %s..."
 
-#: clientgui/AdvancedFrame.cpp:686
+#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
 msgid "Licensing and copyright information."
 msgstr "Informácie o licencovaní a autorských právach."
 
-#: clientgui/AdvancedFrame.cpp:693
+#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
 msgid "&File"
 msgstr "&Súbor"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr "&Náhľad"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:709
 msgid "&Activity"
 msgstr "&Aktivity"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
 msgid "&Options"
 msgstr "&Nastavenia"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
 msgid "&Tools"
 msgstr "&Nástroje"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: clientgui/AdvancedFrame.cpp:1188
+#: clientgui/AdvancedFrame.cpp:1235
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Ukončiť používanie %s"
 
-#: clientgui/AdvancedFrame.cpp:1193
+#: clientgui/AdvancedFrame.cpp:1240
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -571,39 +578,39 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr "Ak prestanete používať %s,\nvšetky Vaše aktuálne projekty zostanú zachované,\nale budete ich musieť spravovať manuálne.\n\nChcete zastaviť používanie %s?"
 
-#: clientgui/AdvancedFrame.cpp:1420
+#: clientgui/AdvancedFrame.cpp:1469
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Vypnúť aktuálneho klienta..."
 
-#: 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 vypne aktuálne pripojeného klienta\na vyzve Vás na pripojenie na iný počítač."
 
-#: 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 bol úspešne pripojený k %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 "Pripájanie k %s"
 
-#: clientgui/AdvancedFrame.cpp:1984
+#: clientgui/AdvancedFrame.cpp:2033
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Pripojené k %s (%s)"
@@ -651,7 +658,9 @@ msgstr "&Ukončiť %s"
 msgid "%s - Communication"
 msgstr "%s - Komunikácia"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "Späť"
 
@@ -724,6 +733,7 @@ msgid ""
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr "%s nie je momentálne pripojený k %s clientovi.\nProsím použite 'Súbor\\Vybrať počítač...' voľbu ponuky pre pripojenie sa k %s klientovi.\nPre pripojenie sa k Vášmu miestnemu počítaču prosím použite 'localhost' ako názov počítača."
 
+#. Create the web sites task group
 #: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "Webstránky projektu"
@@ -808,7 +818,8 @@ msgstr "Vlastnícke práva alebo povolenia pre %s nie sú nastavené správne; p
 msgid " at "
 msgstr " na "
 
-#: clientgui/BOINCGUIApp.cpp:612
+#: clientgui/BOINCGUIApp.cpp:612 clientgui/MainDocument.cpp:2494
+#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
 msgid ")"
 msgstr ")"
 
@@ -818,7 +829,7 @@ msgid ""
 "Please reboot your computer and try again."
 msgstr "Pre správne fungovanie BOINC je potrebný reštart.\nProsím reštartujte počítač a pokus opakujte."
 
-#: clientgui/BOINCGUIApp.cpp:643
+#: clientgui/BOINCGUIApp.cpp:643 clientgui/DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "Správca BOINC"
 
@@ -870,6 +881,7 @@ msgstr "viacnásobné spustenie Správcu BOINC je povolené"
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Nepoužívané: obchádzka chyby v XCode 4.2"
 
+#. These are just special tags so deal with them in a special way
 #: clientgui/BOINCGUIApp.cpp:1166
 msgid "(Automatic Detection)"
 msgstr "(Automatická detekcia)"
@@ -892,13 +904,13 @@ msgstr "Otvoriť web %s..."
 msgid "Open %s..."
 msgstr "Otvoriť %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 "Uspať"
 
-#: 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 "Uspať GPU"
 
@@ -906,52 +918,55 @@ msgstr "Uspať GPU"
 msgid "E&xit"
 msgstr "&Ukončiť"
 
-#: 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 "Pokračovať"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:649
 msgid "Resume GPU"
 msgstr "Pokračovať na GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: clientgui/BOINCTaskBar.cpp:715
 msgid "Computing is enabled"
 msgstr "Počítanie je povolené"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: clientgui/BOINCTaskBar.cpp:719
 msgid "Computing is suspended - "
 msgstr "Počítanie je pozastavené - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: clientgui/BOINCTaskBar.cpp:729
 msgid "GPU computing is enabled"
 msgstr "Počítanie na GPU je povolené"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:732
 msgid "GPU computing is suspended - "
 msgstr "Počítanie na GPU je pozastavené - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: clientgui/BOINCTaskBar.cpp:741
 msgid "Network is enabled"
 msgstr "Sieťové aktivity povolené"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: clientgui/BOINCTaskBar.cpp:744
 msgid "Network is suspended - "
 msgstr "Sieťové aktivity pozastavené - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: clientgui/BOINCTaskBar.cpp:752
 msgid "Reconnecting to client."
 msgstr "Obnovuje sa spojenie s klientom."
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: clientgui/BOINCTaskBar.cpp:754
 msgid "Not connected to a client."
 msgstr "Nepripojené ku klientovi."
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: clientgui/BOINCTaskBar.cpp:807
 #, c-format
 msgid "%s Notices"
 msgstr "%s Oznamy"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: clientgui/BOINCTaskBar.cpp:813
 msgid "There are new notices - click to view."
 msgstr "Objavili sa nové oznamy - kliknite pre ich zobrazenie."
 
@@ -1010,6 +1025,7 @@ msgstr "Aktualizácia z %s je úplná."
 msgid "Update completed."
 msgstr "Aktualizácia je úplná."
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "Teraz sa používa Správca konta"
@@ -1056,48 +1072,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr "BOINC je distribuovaný pod GNU Lesser General Public License v3.0."
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr "Navštívte"
+msgid "For more information, visit "
+msgstr "Pre viac informácií navštívte"
 
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
-msgstr "pre viac informácií."
-
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr "Neplatné číslo"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr "Nesprávny čas, hodnota musí byť medzi 0:00 a 24:00, formát je HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:771
+msgid "Start time must be different from end time"
+msgstr "Začiatočný čas musí byť iný ako koncový"
+
+#: clientgui/DlgAdvPreferences.cpp:685
 msgid "Number must be between 0 and 10"
 msgstr "Číslo musí byť od 0 do 10"
 
-#: clientgui/DlgAdvPreferences.cpp:672
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:772
 msgid "Number must be between 0 and 100"
 msgstr "Číslo musí byť medzi 0 a 100"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "bola nájdená neplatná vstupná hodnota"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 msgid "Validation Error"
 msgstr "Chyba pri validácii"
 
-#: clientgui/DlgAdvPreferences.cpp:1119
+#: clientgui/DlgAdvPreferences.cpp:1158
 msgid "Discard local preferences and use web-based preferences?"
 msgstr "Ignorovať lokálne nastavenia a použiť nastavenia z webstránky projektu?"
 
-#: clientgui/DlgAdvPreferences.cpp:1120
+#: clientgui/DlgAdvPreferences.cpp:1159 clientgui/sg_DlgPreferences.cpp:1171
 msgid "Confirmation"
 msgstr "Potvrdenie"
 
@@ -1106,106 +1122,111 @@ msgstr "Potvrdenie"
 msgid "%s - Computing preferences"
 msgstr "%s - Preferencie počítania"
 
-#: 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 "Používanie lokálnych nastavení.\nKliknite na \"Použiť webové nastavenia\" na použitie nastavení z"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
 msgid "Using web-based preferences from"
 msgstr "Používanie nastavení webstránky z"
 
-#: 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 "Zvoľte hodnoty a kliknite na OK aby sa použili lokálne preferencie."
 
-#: 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 "Táto ponuka obsahuje nastavenia len pre tento počítač.\nKliknite OK pre nastavenia.\nKliknite Clear na obnovenie nastavení z webstránky."
+msgstr "Táto ponuka obsahuje nastavenia len pre tento počítač.\nKliknite OK pre nastavenia.\nKliknite Vymazať pre obnovenie nastavení z webstránky."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:114
+#: clientgui/DlgAdvPreferencesBase.cpp:119
 msgid "Clear"
 msgstr "Vymazať"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:115
+#: clientgui/DlgAdvPreferencesBase.cpp:120
 msgid "Clear all local preferences and close the dialog."
 msgstr "Odstrániť lokálne preferencie a zavrieť ponuku."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:118
+#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:215
 msgid "Use web prefs"
 msgstr "Použiť webové nastavenia"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 msgid "Restore web-based preferences and close the dialog."
-msgstr "Obnoviť nastavenia stránky a zavrieť ponuku."
+msgstr "Obnoviť nastavenia z webstránky a zavrieť ponuku."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:143
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#. Computing schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:148
+#: clientgui/DlgAdvPreferencesBase.cpp:688
 msgid "Computing"
 msgstr "Výpočty"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 msgid "Network"
 msgstr "Sieť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
+#: clientgui/DlgAdvPreferencesBase.cpp:154
 msgid "Disk and memory"
 msgstr "Disk & Pamäť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:152
+#: clientgui/DlgAdvPreferencesBase.cpp:157
 msgid "Daily schedules"
 msgstr "Denné plány"
 
-#: 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:347
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:166
+#: clientgui/DlgAdvPreferencesBase.cpp:171
 msgid "Save all values and close the dialog."
 msgstr "Uložiť všetky hodnoty a uzavrieť okno."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:172
+#: clientgui/DlgAdvPreferencesBase.cpp:177
 msgid "Close the dialog without saving."
 msgstr "Zavrieť ponuku bez uloženia."
 
-#: 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:357
 msgid "Help"
 msgstr "Pomoc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:182
 msgid "Shows the preferences web page."
 msgstr "Ukáže preferencie z webstránky."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:239
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:471
 msgid "Usage limits"
 msgstr "Limity používania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, no-c-format
 msgid ""
 "Keep some CPUs free for other applications. Example: 75% means use 6 cores "
 "on an 8-core CPU."
 msgstr "Ponechať časť procesorov voľnú pre iné aplikácie. Napríklad 75% znamená 6 jadier na 8 jadrovom procesore."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr "Použiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% z procesorov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1213,342 +1234,355 @@ msgid ""
 "and repeat."
 msgstr "Pozastaviť/obnoviť výpočty každých pár sekúnd na zníženie teploty a spotreby energie. Príklad: 75% znamená, že budú prebiehať výpočty 3 sekundy a 1 sekundu sa bude čakať a potom opakovať."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% času CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr "Kedy pozastaviť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr "Pozastaviť keď je počítač napájaný z batérie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "Tu nastavíte, či sa majú výpočty pozastaviť ak je zariadenie napájané z batérie."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr "Pozastaviť ked sa počítač používa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "Tu nastavte pozastavenie výpočtov a prenosov súborov keď používate počítač."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
 msgstr "Pozastaviť výpočty pomocou GPU keď je počítač používaný"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr "Tu nastavíte či sa majú výpočty cez GPU pozastaviť ak používate počítač."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr "Týmto sa určí kedy sa počítač považuje za \"používaný\"."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "\"Používa sa\" znamená použitie myši alebo klávesnice za posledných"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "minút(y)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "Pozastaviť ak je využitie ne-%s procesoru nad"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "Pozastaviť, ak je procesor využívaný mimo BOINC nad"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "Pozastaviť výpočty, ak váš počítač používajú iné programy."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr "Ostatné"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "Uložiť aspoň toľko úloh, aby bol počítač zamestnaný aspoň takto dlho."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr "Uložiť aspoň"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr "dní práce"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:384
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
-msgstr "Ukladať dodatočné úlohy nad minimálnou úrovňou. Určuje aké úsilie je nutné pri kontaktovaní projektu."
+msgstr "Ukladať dodatočné úlohy nad minimálnou úrovňou. Určuje aké koľko práce sa bude vyžadovať pri kontaktovaní projektu."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
-msgstr "Uložiť až do"
+msgstr "Uložiť navyše"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "Pokiaľ beží viacero projektov, %s môže medzi nimi prepínať takto často."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr "Prepínať medzi aplikáciami približne každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:427
 msgid ""
 "This controls how often tasks save their state to disk, so that they can be "
 "restarted later."
 msgstr "Tu sa nastavuje, ako často úlohy ukladajú svoj stav na disk, aby mohli byť neskôr reštartované."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
 msgstr "Ukladať stav úloh každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr "sekúnd"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr "Nastaviť limit sťahovania súborov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr "Obmedziť rýchlosť sťahovania na"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr "KB/s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
-msgstr "Nastaviť rýchlosť odosielania súborov"
+msgstr "Obmedziť rýchlosť odosielania súborov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr "Limit rýchlosti odosielania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr "Napríklad: %s bude prenášať maximálne 2000 MB dát za 30 dní."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "Limit usage to"
 msgstr "Obmedziť použitie "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr "MB každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr "dňa (dní)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, c-format
 msgid ""
 "Check this only if your Internet provider modifies image files. Skipping "
 "verification reduces the security of %s."
 msgstr "Zaškrtnite len ak váš poskytovateľ pripojenia modifikuje súbory. Preskočenie overovaní znižuje bezpečnosť %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Skip data verification for image files"
 msgstr "Preskočiť overovanie pri súboroch obrázkov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
 msgstr "Potvrdiť pred pripojením k Internetu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr "Užitočné len pokiaľ vlastníte ISDN alebo VPN pripojenie."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
 msgstr "Odpojiť po dokončení komunikácie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "Disk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%s použije najprísnejšie z nasledovných nastavení:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, c-format
 msgid "Limit the total amount of disk space used by %s."
-msgstr "Nastaví využitie disku pre %s."
+msgstr "Obmedziť využitie disku pre %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:530
-#: clientgui/DlgAdvPreferencesBase.cpp:554
+#: clientgui/DlgAdvPreferencesBase.cpp:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr "Nepoužiť viac ako"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, c-format
 msgid ""
 "Limit disk usage to leave this much free space on the volume where %s stores"
 " data."
-msgstr "Nastaví použitie disku aby ostalo aspoň toľko voľného miesta na disku, kde sú uložené dáta %s."
+msgstr "Obmedzí použitie disku, aby ostalo aspoň toľko voľného miesta na disku, kde sú uložené dáta %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:542
+#: clientgui/DlgAdvPreferencesBase.cpp:593
 msgid "Leave at least"
 msgstr "Ponechať najmenej"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr "GB voľných"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, c-format
 msgid ""
 "Limit the percentage of disk space used by %s on the volume where it stores "
 "data."
-msgstr "Nastaví percentuálne využitie miesta na disku aplikácoiu %s."
+msgstr "Obmedzí percentuálne využitie miesta na disku aplikáciou %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: clientgui/DlgAdvPreferencesBase.cpp:610
 #, no-c-format
 msgid "% of total"
 msgstr "% celku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr "Pamäť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
-msgstr "Nastavenie pamäte, ktorú %s využíva, ked používate počítač."
+msgstr "Obmedzenie pamäte, ktorú %s využíva, keď používate počítač."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 msgid "When computer is in use, use at most"
 msgstr "Keď sa počítač používa, využiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:579
-#: clientgui/DlgAdvPreferencesBase.cpp:591
-#: clientgui/DlgAdvPreferencesBase.cpp:607
+#: clientgui/DlgAdvPreferencesBase.cpp:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, c-format
 msgid "Limit the memory used by %s when you're not using the computer."
-msgstr "Nastavenie pamäte, ktorú %s využíva, ked nepoužívate počítač."
+msgstr "Obmedzenie pamäte, ktorú %s využíva, keď nepoužívate počítač."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:586
+#: clientgui/DlgAdvPreferencesBase.cpp:637
 msgid "When computer is not in use, use at most"
 msgstr "Keď sa počítač nepoužíva, použiť maximálne"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "Ponechať ne-GPU úlohy v pamäti pri ich pozastavení"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:647
 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 "Ak je zaškrtnuté, pozastavené úlohy ostanú v medzipamäti a môžu byť obnovené bez strát. Ak nie je zaškrtnuté, pozastavené úlohy nebudú uložené v medzipamäti a môžu byť obnovené z ich posledného času uloženia."
+msgstr "Ak je zaškrtnuté, pozastavené úlohy ostanú v pamäti a môžu byť obnovené bez strát práce. Ak nie je zaškrtnuté, pozastavené úlohy nebudú uložené v pamäti a musia byť obnovené z ich posledného času uloženia."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:600
+#: clientgui/DlgAdvPreferencesBase.cpp:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
-msgstr "Nastaviť využitie ukladacieho priestoru (stránkovacieho súboru) pre %s."
+msgstr "Obmedziť využitie ukladacieho priestoru (stránkovacieho súboru) pre %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr "Stránkovací súbor: využiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr "a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr "až"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
-msgstr "Vykonávať výpočty v určitý čas každý deň"
+msgstr "Vykonávať výpočty len v určitý čas každý deň"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr "Počítať len medzi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
-msgstr "Samostatné nastavenia pre dni v týždni:"
+msgstr "Samostatné nastavenia pre dni v týždni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr "Použiť špecifické nastavenia časov pre tieto dni:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr "Pondelok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr "Piatok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr "Sobota"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr "Streda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr "Prenášať súbory len v určitý čas každý deň"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr "Prenos súborov len medzi"
 
@@ -1587,15 +1621,19 @@ msgstr "Zavrieť okno bez uloženia"
 msgid "%s - Event Log"
 msgstr "%s - Záznam udalostí"
 
-#: 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 "Projekt"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
 msgid "Time"
 msgstr "Čas"
 
-#: clientgui/DlgEventLog.cpp:239
+#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
 msgid "Message"
 msgstr "Hlásenie"
 
@@ -1608,6 +1646,7 @@ msgid "Copy &All"
 msgstr "Kopírov&ať všetky"
 
 #: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopírovať všetky správy do kopírovacej schránky."
 
@@ -1616,6 +1655,7 @@ msgid "Copy &Selected"
 msgstr "&Kopírovať vybrané"
 
 #: 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 +1663,7 @@ msgid ""
 msgstr "Kopírovať vybrané správy do schránky. Môžete vybrať viaceré správy ak pri označovaní správ podržíte stlačený Shift alebo príkazovú klávesu."
 
 #: 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 +1705,7 @@ msgid "Add an application to this list"
 msgstr "Pridať aplikáciu do tohto zoznamu"
 
 #: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:90
 msgid "Remove"
 msgstr "Odobrať"
 
@@ -1691,6 +1733,8 @@ msgstr "zatvoriť ponuku bez uloženia"
 msgid "shows the preferences web page"
 msgstr "zobrazí webovú stránku s preferenciami"
 
+#. 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 +1806,7 @@ msgstr "Zapamätať toto rozhodnutie a túto ponuku už nezobrazovať."
 
 #: clientgui/DlgExitMessage.cpp:178 clientgui/DlgGenericMessage.cpp:125
 #: clientgui/DlgOptions.cpp:404 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Späť"
 
@@ -1818,10 +1863,12 @@ msgstr " získavanie práce odložené o"
 msgid " work fetch deferral interval"
 msgstr " interval odkladania získavania práce"
 
+#. set dialog title
 #: clientgui/DlgItemProperties.cpp:239
 msgid "Properties of project "
 msgstr "Vlastnosti projektu "
 
+#. layout controls
 #: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
 msgid "General"
 msgstr "Všeobecné"
@@ -1838,7 +1885,7 @@ msgstr "Používateľské meno"
 msgid "Team name"
 msgstr "Názov tímu"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "Podiel výkonu"
 
@@ -1953,11 +2000,11 @@ msgstr "Koeficient pre korekciu trvania úloh"
 msgid "Properties of task "
 msgstr "Vlastnosti úlohy "
 
-#: clientgui/DlgItemProperties.cpp:357
+#: clientgui/DlgItemProperties.cpp:357 clientgui/ViewWork.cpp:266
 msgid "Application"
 msgstr "Aplikácia"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: clientgui/DlgItemProperties.cpp:358 clientgui/ViewWork.cpp:267
 msgid "Name"
 msgstr "Názov"
 
@@ -2017,7 +2064,8 @@ msgstr "Priečinok"
 msgid "Process ID"
 msgstr "ID procesu"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:456 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:827
 msgid "Local: "
 msgstr "Lokálne: "
 
@@ -2090,6 +2138,7 @@ msgid "Address:"
 msgstr "Adresa:"
 
 #: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
@@ -2102,11 +2151,13 @@ msgid "Leave these blank if not needed"
 msgstr "Toto ponechať prázdne, ak nie je potrebné"
 
 #: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Používateľské meno:"
 
 #: 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 "Heslo:"
 
@@ -2301,6 +2352,7 @@ msgid "The home page of the GEO-600 project"
 msgstr "Domovská stránka projektu GEO-600"
 
 #: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
+#: clientgui/ViewProjects.cpp:247 clientgui/ViewStatistics.cpp:441
 msgid "Team"
 msgstr "Tím"
 
@@ -2466,6 +2518,8 @@ msgstr "Projekt pozastavený používateľom"
 msgid "Task suspended by user"
 msgstr "Úloha pozastavená používateľom"
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "Pozastavené - "
@@ -2622,7 +2676,7 @@ msgstr "Zvoľte projekt kliknutím na jeho názov\nalebo napíšte do kolónky j
 msgid "Categories:"
 msgstr "Kategórie:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "Projekty:"
 
@@ -2781,528 +2835,230 @@ msgstr "Autodetekcia"
 msgid "SOCKS proxy"
 msgstr "SOCKS proxy server"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "Vzhľad"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "Podmienky použitia"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "Vyberte si vzhľad používateľského rozhrania."
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "Prosím prečítajte si nasledovné podmienky použitia:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "Zobraziť diagnostické správy."
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "Súhlasím s podmienkami použitia."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "Pokročilé zobrazenie...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "Nesúhlasím s podmienkami použitia."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "Zobraziť pokročilé grafické rozhranie."
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "Projekt dočasne nedostupný"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "Konfigurovať voľby zobrazenia a nastavenia proxy"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Projekt je dočasne nedostupný.\n\nProsím skúste znova neskôr."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "Správca konta dočasne nedostupný"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "Predvolené"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "Správca konta je dočasne nedostupný.\n\nProsím skúste znova neskôr."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "Pozastaviť"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "Prosím špecifikujte kľúč konta pre pokračovanie."
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "Pozastaviť výpočty"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "Neplatný kľúč konta; prosím vložte platný kľúč konta"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "Pokračovať vo výpočtoch"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "Konflikt pri validácii"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "Oznamy"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "Prosím špecifikujte emailovú adresu"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "Otvoriť okno zobrazujúce oznamy z projektov a BOINC"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "Neplatná emailová adresa; prosím vložiť správnu emailovú adresu"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "Získať pomoc s %s"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "Chýbajúca URL"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "Načítavajú sa oznamy, prosím počkajte..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "Prosím špecifikujte URL.\nNapríklad:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "Zatiaľ neexistujú žiadne oznamy."
+#: 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 "Neplatná URL"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "Zatvoriť"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "Prosím špecifikujte správnu URL.\nNapríklad:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "%s - Oznamy"
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s' neobsahuje správny názov počítača."
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "Pre ďalšie nastavenie vyberte Výpočtové preferencie v Pokročilom zobrazení."
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s' neobsahuje správnu cestu."
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "Miesto na disku (GB)"
+#. 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 "Príkazy"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - &Preferencie počítania"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "Kopírovať všetky správy"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "Ignorovať lokálne nastavenia a použiť nastavenia z webstránky projektu?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "Kopírovať vybraté správy"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "Zobraziť len tento projekt"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "Zobraziť správy len z vybraného projektu."
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "Správy"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "Kopírovanie všetkých správ do schránky..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "Kopírovanie vybraných správ do schránky..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "Filtrovanie správ..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "Zobraziť všetky správy"
+
+#: clientgui/ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "Zobraziť správy zo všetkých projektov."
+
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "Načítavajú sa oznamy, prosím počkajte..."
+
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "Zatiaľ neexistujú žiadne oznamy."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
+msgid "Notices"
+msgstr "Oznamy"
+
+#: clientgui/ViewProjects.cpp:196 clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
+#: 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 "Odoslať všetky dokončené úlohy, získať posledný kredit, získať posledné preferencie a ak je možné získať ďalšie úlohy."
 
+#: 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 "Pozastaviť"
+
+#: 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 "Pozastaviť úlohy pre tento projekt."
 
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:821
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
 msgid "No new tasks"
 msgstr "Žiadne nové úlohy"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "Nezískať nové úlohy pre tento projekt."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "Resetovať projekt"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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 "Vymazať všetky súbory a úlohy spojené s týmto projektom a získať nové úlohy.  Mali by ste najskôr aktualizovať projekt pre odoslanie všetkých dokončených úloh."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
+#: 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 "Odpojiť počítač od tohto projektu.  Rozpracované úlohy budú stratené (použite najskôr 'Aktualizovať' pre odoslanie všetkých dokončených úloh)."
 
+#: clientgui/ViewProjects.cpp:231 clientgui/ViewWork.cpp:246
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr "Zobraziť detaily projektu."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr "Pokračovať na úlohách pre tento projekt."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "Povoliť nové úlohy"
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "Konto"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "Povoliť sťahovanie nových úloh pre tento projekt."
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+msgstr "Kredit"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-msgid "Don't fetch new tasks for this project."
-msgstr "Nesťahovať nové úlohy pre tento projekt."
-
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
-msgstr "Ste si istý, že chcete resetovať projekt '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-msgid "Reset Project"
-msgstr "Resetovať projekt"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
-msgstr "Ste si istý, že chcete odpojiť projekt '%s'?"
-
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-msgid "Remove Project"
-msgstr "Odstrániť projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "Pridať projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "Sychronizovať"
-
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "Práca hotová pre tento projekt"
-
-#: clientgui/sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "Staňte sa dobrovoľníkom v ktoromkoľvek z vyše 30 projektov v mnohých oblastiach vedy"
-
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "Synchronizovať projekty so systémom Správcu konta"
-
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "Zvoľte projekt na zobrazenie s ovládačmi dolu"
-
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "Webstránky projektu"
-
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "Príkazy projektu"
-
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "Zobraziť ponuku webových stránok projektu %s"
-
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "Zobraziť menu príkazov pre projekt %s"
-
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "Zobraziť grafiku"
-
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "Zobraziť okno s grafikou aplikácie."
-
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "Pozastaviť túto úlohu."
-
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "Zrušiť"
-
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "Zrušiť túto úlohu. Nedostanete za ňu žiaden kredit."
-
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "Zobraziť detaily úlohy."
-
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "Pokračovať v práci na tejto úlohe."
-
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "Pozastaviť prácu na tejto úlohe."
-
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr "Ste si istý že chcete zrušiť túto úlohu '%s'?\n(Priebeh: %.1lf%%, Stav: %s)"
-
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "Zrušiť úlohu"
-
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "Nemáte žiadne projekty.  Prosím pridajte projekt."
-
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "Nie je k dispozícii"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "Úlohy:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "Zvoliť úlohu"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "Od:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "Priebeh tejto úlohy"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "Príkazy pre úlohu"
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "Zobraziť menu príkazov pre túto úlohu"
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "Aplikácia: %s"
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "Aplikácia: Nie je k dispozícii"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "Nie je k dispozícii"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "Uplynulo: %s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "Zostáva (odhad): %s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "Stav: %s"
-
-#: clientgui/sg_TaskPanel.cpp:1228
-msgid "Retrieving current status."
-msgstr "Obnovovanie aktuálneho stavu."
-
-#: clientgui/sg_TaskPanel.cpp:1234
-msgid "Downloading work from the server."
-msgstr "Sťahovanie práce zo servera."
-
-#: clientgui/sg_TaskPanel.cpp:1239
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "Spracovanie pozastavené:  Beh na batérie."
-
-#: clientgui/sg_TaskPanel.cpp:1241
-msgid "Processing Suspended:  User Active."
-msgstr "Spracovanie pozastavené:  Používateľ pracuje."
-
-#: clientgui/sg_TaskPanel.cpp:1243
-msgid "Processing Suspended:  User paused processing."
-msgstr "Spracovanie pozastavené: Používateľ pozastavil spracovanie."
-
-#: clientgui/sg_TaskPanel.cpp:1245
-msgid "Processing Suspended:  Time of Day."
-msgstr "Spracovanie pozastavené:  Denná doba."
-
-#: clientgui/sg_TaskPanel.cpp:1247
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "Spracovanie pozastavené:  Bežia testy rýchlosti."
-
-#: clientgui/sg_TaskPanel.cpp:1249
-msgid "Processing Suspended."
-msgstr "Spracovanie pozastavené."
-
-#: clientgui/sg_TaskPanel.cpp:1253
-msgid "Waiting to contact project servers."
-msgstr "Čakanie na spojenie so servermi projektu."
-
-#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
-msgid "Retrieving current status"
-msgstr "Obnovovanie aktuálneho stavu"
-
-#: clientgui/sg_TaskPanel.cpp:1261
-msgid "No work available to process"
-msgstr "Nie je dostupná žiadna práca na spracovanie"
-
-#: clientgui/sg_TaskPanel.cpp:1263
-msgid "Unable to connect to the core client"
-msgstr "Zlyhalo pripojenie ku klientovi"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "Podmienky použitia"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "Prosím prečítajte si nasledovné podmienky použitia:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "Súhlasím s podmienkami použitia."
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "Nesúhlasím s podmienkami použitia."
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "Projekt dočasne nedostupný"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "Projekt je dočasne nedostupný.\n\nProsím skúste znova neskôr."
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "Správca konta dočasne nedostupný"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "Správca konta je dočasne nedostupný.\n\nProsím skúste znova neskôr."
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "Prosím špecifikujte kľúč konta pre pokračovanie."
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "Neplatný kľúč konta; prosím vložte platný kľúč konta"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "Konflikt pri validácii"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "Prosím špecifikujte emailovú adresu"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "Neplatná emailová adresa; prosím vložiť správnu emailovú adresu"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "Chýbajúca URL"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "Prosím špecifikujte URL.\nNapríklad:\nhttp://www.example.com/"
-
-#: 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 "Neplatná URL"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "Prosím špecifikujte správnu URL.\nNapríklad:\nhttp://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s' neobsahuje správny názov počítača."
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s' neobsahuje správnu cestu."
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "Príkazy"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "Kopírovať všetky správy"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "Kopírovať vybraté správy"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "Zobraziť len tento projekt"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "Zobraziť správy len z vybraného projektu."
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "Správy"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "Kopírovanie všetkých správ do schránky..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "Kopírovanie vybraných správ do schránky..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "Filtrovanie správ..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "Zobraziť všetky správy"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "Zobraziť správy zo všetkých projektov."
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "Konto"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "Kredit"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "Denný priemer"
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
+msgstr "Denný priemer"
 
 #: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
@@ -3337,14 +3093,48 @@ msgstr "Pokyn projektu, aby nesťahoval žiadne ďalšie úlohy..."
 msgid "Resetting project..."
 msgstr "Resetovanie projektu..."
 
+#: clientgui/ViewProjects.cpp:518 clientgui/sg_ProjectCommandPopup.cpp:229
+#, c-format
+msgid "Are you sure you want to reset project '%s'?"
+msgstr "Ste si istý, že chcete resetovať projekt '%s'?"
+
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:235
+msgid "Reset Project"
+msgstr "Resetovať projekt"
+
 #: clientgui/ViewProjects.cpp:563
 msgid "Removing project..."
 msgstr "Odstraňovanie projektu..."
 
+#: clientgui/ViewProjects.cpp:576 clientgui/sg_ProjectCommandPopup.cpp:266
+#, c-format
+msgid "Are you sure you want to remove project '%s'?"
+msgstr "Ste si istý, že chcete odpojiť projekt '%s'?"
+
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:272
+msgid "Remove Project"
+msgstr "Odstrániť projekt"
+
 #: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Spúšťanie webového prehliadača..."
 
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
+msgstr "Pokračovať na úlohách pre tento projekt."
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
+msgstr "Povoliť nové úlohy"
+
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
+msgstr "Povoliť sťahovanie nových úloh pre tento projekt."
+
+#: clientgui/ViewProjects.cpp:821 clientgui/sg_ProjectCommandPopup.cpp:137
+msgid "Don't fetch new tasks for this project."
+msgstr "Nesťahovať nové úlohy pre tento projekt."
+
 #: clientgui/ViewProjects.cpp:1140
 msgid "Requested by user"
 msgstr "Vyžiadané používateľom"
@@ -3628,195 +3418,444 @@ msgstr ".\nMôžete povoliť v menu Aktivity."
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "Opakovanie prenosu teraz..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "Opakovanie prenosu teraz..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "Prerušenie prenosu..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "Ste si istý, že chcete zrušiť prenos tohoto súboru '%s'?\nPOZNÁMKA: Zrušenie prenosu neodsúhlasí úlohu a Vy\nza ňu nedostanete pridelený kredit."
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "Zrušiť prenos súboru"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "Odosielanie"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "Sťahovanie"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "zopakuje sa o "
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "zlyhalo"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "pozastavené"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "prebieha"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "čaká"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr " (odsunutie projektu: "
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "Zobraziť aktívne úlohy"
+
+#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
+msgid "Show only active tasks."
+msgstr "Zobraziť len aktívne úlohy."
+
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
+msgid "Show graphics"
+msgstr "Zobraziť grafiku"
+
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
+msgid "Show application graphics in a window."
+msgstr "Zobraziť okno s grafikou aplikácie."
+
+#: clientgui/ViewWork.cpp:225
+msgid "Show VM Console"
+msgstr "Ukázať konzolu VM"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "Zobraziť okno s konzolou VM."
+
+#: clientgui/ViewWork.cpp:233
+msgid "Suspend work for this result."
+msgstr "Pozastaviť prácu na tomto výsledku."
+
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
+msgid "Abort"
+msgstr "Zrušiť"
+
+#: clientgui/ViewWork.cpp:240
+msgid "Abandon work on the result. You will get no credit for it."
+msgstr "Zanechať prácu na tomto výsledku. Nedostanete zaň žiaden kredit."
+
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
+msgid "Show task details."
+msgstr "Zobraziť detaily úlohy."
+
+#: clientgui/ViewWork.cpp:264
+msgid "Remaining (estimated)"
+msgstr "Zostáva (odhad)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "Odoslať do"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "Úlohy"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "Pokračovanie úlohy..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "Pozastavenie úlohy..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "Zobrazenie grafiky pre úlohu..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "Zobrazenie konzoly VM pre úlohu..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "Ste si istý, že chcete zrušiť túto úlohu '%s'?\n(Priebeh: %s, Stav: %s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+msgid "Are you sure you want to abort these %d tasks?"
+msgstr "Ste si istý, že chcete zrušiť týchto %d úloh?"
+
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
+msgid "Abort task"
+msgstr "Zrušiť úlohu"
+
+#: clientgui/ViewWork.cpp:586
+msgid "Aborting task..."
+msgstr "Ruší sa prenos..."
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "Zobraziť všetky úlohy"
+
+#: clientgui/ViewWork.cpp:859
+msgid "Show all tasks."
+msgstr "Zobraziť všetky úlohy."
+
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr "Pokračovať v práci na tejto úlohe."
+
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr "Pozastaviť prácu na tejto úlohe."
+
+#: clientgui/WizardAttach.cpp:571
+msgid "Do you really want to cancel?"
+msgstr "Chcete skutočne zrušiť operáciu?"
+
+#: clientgui/WizardAttach.cpp:572
+msgid "Question"
+msgstr "Otázka"
+
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
+msgstr "Pie Ctrl"
+
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
+msgid "Services"
+msgstr "Služby"
+
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
+#, c-format
+msgid "Hide %s"
+msgstr "Skryť %s"
+
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
+msgstr "Skryť ostatné"
+
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
+msgstr "Zobraziť všetky"
+
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
+msgstr "Ukončiť %s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr "Vzhľad"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr "Vyberte si vzhľad používateľského rozhrania."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "Pokročilé zobrazenie...\tCtrl+Shift+A"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
+msgstr "Zobraziť pokročilé grafické rozhranie."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr "Konfigurovať voľby zobrazenia a nastavenia proxy"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr "Zobraziť diagnostické správy."
+
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
+msgstr "Predvolené"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
+msgstr "Pozastaviť výpočty"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
+msgstr "Pokračovať vo výpočtoch"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "Otvoriť okno zobrazujúce oznamy z projektov a BOINC"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:360
+#, c-format
+msgid "Get help with %s"
+msgstr "Získať pomoc s %s"
+
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "Zatvoriť"
+
+#: clientgui/sg_DlgMessages.cpp:394
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - Oznamy"
+
+#: clientgui/sg_DlgPreferences.cpp:206
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "Pre ďalšie nastavenie vyberte Výpočtové preferencie v Pokročilom zobrazení."
+
+#: clientgui/sg_DlgPreferences.cpp:340
+msgid "GB of disk space"
+msgstr "Miesto na disku (GB)"
+
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - &Preferencie počítania"
+
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "Odstrániť lokálne nastavenia a použiť nastavenia z webstránky projektu?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "Pridať projekt"
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "Prerušenie prenosu..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "Sychronizovať"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "Ste si istý, že chcete zrušiť prenos tohoto súboru '%s'?\nPOZNÁMKA: Zrušenie prenosu neodsúhlasí úlohu a Vy\nza ňu nedostanete pridelený kredit."
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "Práca hotová pre tento projekt"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "Zrušiť prenos súboru"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "Staňte sa dobrovoľníkom v ktoromkoľvek z vyše 30 projektov v mnohých oblastiach vedy"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "Odosielanie"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "Synchronizovať projekty so systémom Správcu konta"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-msgstr "Sťahovanie"
+#. 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 "Zvoľte projekt na zobrazenie s ovládačmi dolu"
 
-#: clientgui/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "zopakuje sa o "
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "Webstránky projektu"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "zlyhalo"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "Príkazy projektu"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "pozastavené"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "Zobraziť ponuku webových stránok projektu %s"
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
-msgstr "prebieha"
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "Zobraziť menu príkazov pre projekt %s"
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "čaká"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "Pozastaviť túto úlohu."
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr " (odsunutie projektu: "
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "Zrušiť túto úlohu. Nedostanete za ňu žiaden kredit."
 
-#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-msgstr "Zobraziť aktívne úlohy"
+#: clientgui/sg_TaskCommandPopup.cpp:267
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "Ste si istý že chcete zrušiť túto úlohu '%s'?\n(Priebeh: %.1lf%%, Stav: %s)"
 
-#: clientgui/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "Zobraziť len aktívne úlohy."
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "Nemáte žiadne projekty.  Prosím pridajte projekt."
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "Ukázať konzolu VM"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "Nie je k dispozícii"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "Zobraziť okno s konzolou VM."
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "Úlohy:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-msgstr "Pozastaviť prácu na tomto výsledku."
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
+msgstr "Zvoliť úlohu"
 
-#: clientgui/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "Zanechať prácu na tomto výsledku. Nedostanete zaň žiaden kredit."
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "Od:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "Zostáva (odhad)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "Priebeh tejto úlohy"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "Odoslať do"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "Príkazy pre úlohu"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "Úlohy"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "Zobraziť menu príkazov pre túto úlohu"
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "Pokračovanie úlohy..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "Aplikácia: %s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "Pozastavenie úlohy..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "Zobrazenie grafiky pre úlohu..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "Aplikácia: Nie je k dispozícii"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "Zobrazenie konzoly VM pre úlohu..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "Nie je k dispozícii"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "Ste si istý, že chcete zrušiť túto úlohu '%s'?\n(Priebeh: %s, Stav: %s)"
+msgid "Elapsed: %s"
+msgstr "Uplynulo: %s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "Ste si istý, že chcete zrušiť týchto %d úloh?"
+msgid "Remaining (estimated): %s"
+msgstr "Zostáva (odhad): %s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "Ruší sa prenos..."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "Stav: %s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "Zobraziť všetky úlohy"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "Obnovovanie aktuálneho stavu."
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "Zobraziť všetky úlohy."
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "Sťahovanie práce zo servera."
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "Pripojiť k projektu alebo Správcovi konta"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "Spracovanie pozastavené:  Beh na batérie."
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "Pripojiť projekt alebo použiť Správcu konta BOINC"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+msgstr "Spracovanie pozastavené:  Používateľ pracuje."
 
-#: 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 "Ak je to možné, pridajte projekty\nna webovej stránke %s.\n\nProjekty pridané týmto sprievodcom nebudú\nv zozname %s a nepôjdu ním spravovať."
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "Spracovanie pozastavené: Používateľ pozastavil spracovanie."
 
-#: 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 "Existuje vyše 30 projektov pracujúcich pod BOINC,\nktoré vykonávajú výskum v mnohých oblastiach vedy,\na Vy sa môžete zapojiť do koľkých z nich chcete.\nMôžete sa pripojiť k projektu priamo, alebo použiť\nna výber projektov webovú stránku 'Správcu konta'."
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "Spracovanie pozastavené:  Denná doba."
 
-#: 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 "Idete pripojiť nový projekt pro dobrovolné výpočty alebo upraviť projekty,\ndo ktorých už prispievate.\n\nNiektoré z týchto projektov sú spravované organizáciou World Community Grid,\nkým ostatné prevádzkujú iní výskumníci a organizácie.\nAplikácia BOINC Vám umožní rozdeliť výpočtový výkon medzi\nľubovoľnú kombináciu projektov.\n\nAk ste registrovaní u Správcu účtu BOINC, môžete spravovať\nVaše projekty v ňom.\n\nVyberte si prosím typ zmeny, ktorú chcete vykonať:\n"
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "Spracovanie pozastavené:  Bežia testy rýchlosti."
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "Použiť Správcu konta BOINC"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "Spracovanie pozastavené."
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "Pripojiť alebo zmeniť projekty World Community Grid"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "Čakanie na spojenie so servermi projektu."
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "Pripojiť projekty spravované inými výskumníkmi a organizáciami"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "Obnovovanie aktuálneho stavu"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "Chcete skutočne zrušiť operáciu?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "Nie je dostupná žiadna práca na spracovanie"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-msgstr "Otázka"
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
+msgstr "Zlyhalo pripojenie ku klientovi"
 
 #: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
 msgid "&Next >"
@@ -3830,32 +3869,7 @@ msgstr "< &Späť"
 msgid "&Finish"
 msgstr "&Dokončiť"
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
-
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
-msgstr "Služby"
-
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
-msgstr "Skryť %s"
-
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
-msgstr "Skryť ostatné"
-
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
-msgstr "Zobraziť všetky"
-
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
-msgstr "Ukončiť %s"
-
+#. /////////////////////////////////////////////////////////////////////////
 #: clientgui/DlgAdvPreferencesBase.h:45
 msgid "On this day of the week, compute only during these hours."
 msgstr "Tento deň v týždni pracovať len počas týchto hodín."
diff --git a/locale/sk/BOINC-Project-Generic.po b/locale/sk/BOINC-Project-Generic.po
index 9f8ef0d..7250a9f 100644
--- a/locale/sk/BOINC-Project-Generic.po
+++ b/locale/sk/BOINC-Project-Generic.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-03-04 08:56 PST\n"
-"PO-Revision-Date: 2015-03-27 23:10+0000\n"
-"Last-Translator: Michal\n"
+"PO-Revision-Date: 2015-05-26 11:00+0000\n"
+"Last-Translator: aceman\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/boinc/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -260,7 +260,7 @@ msgstr "Od najnovších"
 
 #: ../inc/forum.inc:40
 msgid "Highest rated posts first"
-msgstr "Zobraziť najlepšie hodntené správy ako prvé"
+msgstr "Zobraziť najlepšie hodnotené správy ako prvé"
 
 #: ../inc/forum.inc:42
 msgid "Newest post first"
@@ -434,7 +434,7 @@ msgstr "Odpovedať na túto správu"
 
 #: ../inc/forum.inc:691
 msgid "Quote"
-msgstr "Citát"
+msgstr "Citovať"
 
 #: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
@@ -450,7 +450,7 @@ msgstr "Uverejnené %1 od %2"
 
 #: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
-msgstr "Počkajte s odosielaním alebo hodnotením správ do %1"
+msgstr "Nemôžete odosielať alebo hodnotiť správy do %1"
 
 #: ../inc/forum.inc:762
 msgid ""
@@ -468,7 +468,7 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr "\n<ul>\n<li> Správy musia byt vhodné aj pre detského čitateľa, nesú obsahovať obscénny, nenávistný alebo erotický obsah.\n<li> Žiadne reklamy\n<li> Žiadne odkazy na stránky s erotickým obsahom, propagujúcim hazard alebo nenávisť.\n<li> Žiadne správy s urážlivým obsahom voči jednotlivcom alebo skupinám ľudí.\n<li> Žiadne urážlivé komentáre namierené proti náboženstvu, národnosti, rase, pohlaviu alebo sexuálnej orientácii."
+msgstr "\n<ul>\n<li> Správy musia byť vhodné aj pre detského čitateľa, nesmú obsahovať obscénny, nenávistný alebo erotický obsah.\n<li> Žiadne reklamy.\n<li> Žiadne odkazy na stránky s erotickým obsahom, propagujúcim hazard alebo nenávisť.\n<li> Žiadne správy určené na obťažovanie iných ľudí alebo ovládnutie témy.\n<li> Žiadne správy s urážlivým obsahom voči jednotlivcom alebo skupinám ľudí.\n<li> Žiadne urážlivé komentáre namierené proti náboženstvu, národnosti, rase, pohlaviu alebo sex [...]
 
 #: ../inc/forum.inc:784
 msgid "Rules:"
@@ -484,7 +484,7 @@ msgstr "Odkryť"
 
 #: ../inc/forum.inc:1082
 msgid "Unhide this post"
-msgstr "Zobraziť túto správu"
+msgstr "Odkryť túto správu"
 
 #: ../inc/forum.inc:1084 ../user/forum_thread.php:196
 msgid "Hide"
@@ -508,15 +508,15 @@ msgstr "Zablokovať autora"
 
 #: ../inc/forum.inc:1101
 msgid "Vote to banish author"
-msgstr "Voliť na zablokovanie autora"
+msgstr "Hlasovať za zablokovanie autora"
 
 #: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
-msgstr "Voliť na neblokovanie autora"
+msgstr "Hlasovať za neblokovanie autora"
 
 #: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
-msgstr "Začať voľbu na zablokovanie autora"
+msgstr "Začať hlasovanie na zablokovanie autora"
 
 #: ../inc/forum.inc:1115 ../inc/user.inc:312 ../user/forum_thread.php:243
 #: ../user/pm.php:112 ../user/pm.php:152
@@ -800,7 +800,7 @@ msgstr "Posledné skontaktovanie so serverom"
 
 #: ../inc/host.inc:186
 msgid "Fraction of time BOINC is running"
-msgstr "Časť času kedy BOINC beží."
+msgstr "Podiel času kedy BOINC beží"
 
 #: ../inc/host.inc:188
 msgid ""
@@ -888,7 +888,7 @@ msgstr "Detaily"
 
 #: ../inc/host.inc:345
 msgid "Cross-project stats:"
-msgstr "Medziprojektové štatistiký:"
+msgstr "Medziprojektové štatistiky:"
 
 #: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
diff --git a/locale/templates/BOINC-Drupal.pot b/locale/templates/BOINC-Drupal.pot
new file mode 100644
index 0000000..8b0192f
--- /dev/null
+++ b/locale/templates/BOINC-Drupal.pot
@@ -0,0 +1,2001 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME <EMAIL at ADDRESS>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2015-05-07 12:21+0000\n"
+"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
+"Last-Translator: NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <EMAIL at ADDRESS>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#:  
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> "
+"associated with your e-mail address, it will be used for your user "
+"picture."
+msgstr ""
+
+#:  
+msgid "Your Gravatar will not be shown if you upload a user picture."
+msgstr ""
+
+#:  
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> "
+"associated with your e-mail address, use it for your user picture."
+msgstr ""
+
+#:  
+msgid "Gravatar will not be shown if an avatar is uploaded."
+msgstr ""
+
+#:  
+msgid "This is not available until your profile is set up."
+msgstr ""
+
+#:  
+msgid "Should @project show your computers on its web site?"
+msgstr ""
+
+#:  
+msgid "Click here to revoke your membership with @this_team"
+msgstr ""
+
+#:  
+msgid "Minimum avg credit to post"
+msgstr ""
+
+#:  
+msgid "Founder & Team Admins have moderator privileges"
+msgstr ""
+
+#:  
+msgid "Notes about changes in foundership:"
+msgstr ""
+
+#:  
+msgid "Foundership can be requested by team members:"
+msgstr ""
+
+#:  
+msgid "One request is allowed at a time"
+msgstr ""
+
+#:  
+msgid "Any active request must be older than 90 days"
+msgstr ""
+
+#:  
+msgid "Current founder has 60 days to respond to a request"
+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 "You may create a message board for use by @team"
+msgstr ""
+
+#:  
+msgid "parent removed"
+msgstr ""
+
+#:  
+msgid "Maximum daily WU quota per CPU"
+msgstr ""
+
+#:  
+msgid "Received time"
+msgstr ""
+
+#:  
+msgid "App ID"
+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 "Target number of results"
+msgstr ""
+
+#:  
+msgid "Application version ID"
+msgstr ""
+
+#:  
+msgid "Plan class"
+msgstr ""
+
+#:  
+msgid "Version number"
+msgstr ""
+
+#:  
+msgid "App version ID"
+msgstr ""
+
+#:  
+msgid "@count million ops/sec"
+msgstr ""
+
+#:  
+msgid "@rate KiB/sec"
+msgstr ""
+
+#:  
+msgid "@count days"
+msgstr ""
+
+#:  
+msgid "@ip_address (same the last @count times)"
+msgstr ""
+
+#:  
+msgid "commented on"
+msgstr ""
+
+#:  
+msgid "Remove sticky status from this topic"
+msgstr ""
+
+#:  
+msgid ""
+"Check the computers that are the same as @name (created on @date at "
+"@time with computer ID @id)"
+msgstr ""
+
+#:  
+msgid "Computer @old_id has been merged successfully into @id."
+msgstr ""
+
+#:  
+msgid "started discussion"
+msgstr ""
+
+#:  
+msgid "posted"
+msgstr ""
+
+#:  
+msgid "Minimum value not met for @field"
+msgstr ""
+
+#:  
+msgid "Invalid data type for @field"
+msgstr ""
+
+#:  
+msgid ""
+"Authentication is required when changing E-mail address or setting new "
+"password."
+msgstr ""
+
+#:  
+msgid "Request foundership"
+msgstr ""
+
+#:  
+msgid ""
+"If the team founder is not active and you want to assume the role of "
+"founder, click below to request foundership of @this_team."
+msgstr ""
+
+#:  
+msgid "Initiate request"
+msgstr ""
+
+#:  
+msgid "A BOINC account already exists for @email."
+msgstr ""
+
+#:  
+msgid ""
+"Please be responsible in what you write and do not create posts which "
+"are offensive or insulting. Offensive posts or threads may be deleted "
+"by forum moderators without warning or discussion. Do not respond to "
+"offensive postings. Click on the \"report\" button at the bottom of "
+"the post to call it to the attention of the moderators."
+msgstr ""
+
+#:  
+msgid "this project"
+msgstr ""
+
+#:  
+msgid ""
+"We also ask that you keep all discussion on the message boards related "
+"to @project or BOINC with the small exception of the Science message "
+"board where you are free to discuss anything relevant to the "
+"underlying science. Participants interested in broader discussions "
+"should post to unofficial forums for @project."
+msgstr ""
+
+#:  
+msgid "These message boards now support BBCode tags only."
+msgstr ""
+
+#:  
+msgid "Posts contributed"
+msgstr ""
+
+#:  
+msgid "Profile awaiting moderator approval"
+msgstr ""
+
+#:  
+msgid "Approve profile"
+msgstr ""
+
+#:  
+msgid "Approve this profile content"
+msgstr ""
+
+#:  
+msgid "Edit profile"
+msgstr ""
+
+#:  
+msgid "Edit the content of this profile"
+msgstr ""
+
+#:  
+msgid "Remove profile"
+msgstr ""
+
+#:  
+msgid "Remove this profile content from the system"
+msgstr ""
+
+#:  
+msgid "The team founder has @count days to respond to your transfer request."
+msgstr ""
+
+#:  
+msgid "Reject profile"
+msgstr ""
+
+#:  
+msgid "Reject this profile content"
+msgstr ""
+
+#:  
+msgid "Reason for rejecting this profile"
+msgstr ""
+
+#:  
+msgid ""
+"This reason will be included in an email to the user. Please write a "
+"brief explanation of the problem and how to fix it."
+msgstr ""
+
+#:  
+msgid "Submit"
+msgstr ""
+
+#:  
+msgid "project"
+msgstr ""
+
+#:  
+msgid "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 ""
+
+#:  
+msgid "Join now"
+msgstr ""
+
+#:  
+msgid "I'm new"
+msgstr ""
+
+#:  
+msgid "I'm a BOINC user"
+msgstr ""
+
+#:  
+msgid "Welcome back!"
+msgstr ""
+
+#:  
+msgid ""
+"Einstein at 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 ""
+
+#:  
+msgid "Learn more"
+msgstr ""
+
+#:  
+msgid "View account"
+msgstr ""
+
+#:  
+msgid "About our screensaver"
+msgstr ""
+
+#:  
+msgid "Over 500,000 volunteers and counting."
+msgstr ""
+
+#:  
+msgid "Windows"
+msgstr ""
+
+#:  
+msgid "Mac"
+msgstr ""
+
+#:  
+msgid "Linux"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+msgid "BOINC user ID"
+msgstr ""
+
+#:  
+msgid "Drupal user ID"
+msgstr ""
+
+#:  
+msgid "Account key"
+msgstr ""
+
+#:  
+msgid "Weak account key"
+msgstr ""
+
+#:  
+msgid "Cross-project ID"
+msgstr ""
+
+#:  
+msgid "Save changes"
+msgstr ""
+
+#:  
+msgid "Cancel"
+msgstr ""
+
+#:  
+msgid "Change password"
+msgstr ""
+
+#:  
+msgid "What is @this_project?"
+msgstr ""
+
+#:  
+msgid "no projects..."
+msgstr ""
+
+#:  
+msgid "Download the desktop software"
+msgstr ""
+
+#:  
+msgid "Run the installer"
+msgstr ""
+
+#:  
+msgid "When prompted enter @siteurl"
+msgstr ""
+
+#:  
+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 <i>Add\n"
+"      Project</i>."
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+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 ""
+
+#:  
+msgid ""
+"1) If you know your account's email address, and you can receive "
+"email there:"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+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 ""
+
+#:  
+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 ""
+
+#:  
+msgid " Default value: @default"
+msgstr ""
+
+#:  
+msgid "Applications"
+msgstr ""
+
+#:  
+msgid "yes"
+msgstr ""
+
+#:  
+msgid "no"
+msgstr ""
+
+#:  
+msgid "Message @id"
+msgstr ""
+
+#:  
+msgid "message @id"
+msgstr ""
+
+#:  
+msgid " in response to !parent"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+msgid "n/a"
+msgstr ""
+
+#:  
+msgid "Submitted by !username on !datetime"
+msgstr ""
+
+#:  
+msgid "Member since"
+msgstr ""
+
+#:  
+msgid "View team"
+msgstr ""
+
+#:  
+msgid "Friends (@count)"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+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 ""
+
+#:  
+msgid "Threads"
+msgstr ""
+
+#:  
+msgid "Posts"
+msgstr ""
+
+#:  
+msgid "Last post"
+msgstr ""
+
+#:  
+msgid "Manage subscriptions"
+msgstr ""
+
+#:  
+msgid "Featured"
+msgstr ""
+
+#:  
+msgid "Submitted on !datetime"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+msgid "Enforced by version @number"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+msgid "0 means no restriction. Enforced by version @number"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+msgid "On multiprocessors, use at most"
+msgstr ""
+
+#:  
+msgid "processors"
+msgstr ""
+
+#:  
+msgid "Set to 0 for no limit"
+msgstr ""
+
+#:  
+msgid "% of the processors"
+msgstr ""
+
+#:  
+msgid "Use at most"
+msgstr ""
+
+#:  
+msgid "% of the CPU time"
+msgstr ""
+
+#:  
+msgid "Can be used to reduce CPU heat"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+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 ""
+
+#:  
+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 ""
+
+#:  
+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 ""
+
+#:  
+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 ""
+
+#:  
+msgid "Use CPU"
+msgstr ""
+
+#:  
+msgid "Use NVIDIA GPU"
+msgstr ""
+
+#:  
+msgid "Use ATI GPU"
+msgstr ""
+
+#:  
+msgid "Use INTEL GPU"
+msgstr ""
+
+#:  
+msgid "Beta settings"
+msgstr ""
+
+#:  
+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 ""
+
+#:  
+msgid "Mark all topics read"
+msgstr ""
+
+#:  
+msgid "Mark all forums read"
+msgstr ""
+
+#:  
+msgid ""
+"CAPTCHA validation error: unknown CAPTCHA session ID. Contact the site "
+"administrator if this problem persists."
+msgstr ""
+
+#:  
+msgid "The answer you entered for the CAPTCHA was not correct."
+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 ""
+
+#:  
+msgid "Post comment"
+msgstr ""
+
+#:  
+msgid "No @type tasks"
+msgstr ""
+
+#:  
+msgid "There are no tasks of this type on record"
+msgstr ""
+
+#:  
+msgid "Clear"
+msgstr ""
+
+#:  
+msgid ""
+"This will remove all of your settings from the @name preference set. "
+"Are you sure?"
+msgstr ""
+
+#:  
+msgid "These apply to all BOINC projects in which you participate."
+msgstr ""
+
+#:  
+msgid ""
+"On computers attached to multiple projects, the most recently modified "
+"preferences will be used."
+msgstr ""
+
+#:  
+msgid "Preferences last modified: @mod_time"
+msgstr ""
+
+#:  
+msgid "Combined preferences"
+msgstr ""
+
+#:  
+msgid "Switch View"
+msgstr ""
+
+#:  
+msgid "every"
+msgstr ""
+
+#:  
+msgid "Edit"
+msgstr ""
+
+#:  
+msgid ""
+"This will remove all of your settings from the \"@name\" preference "
+"set. Are you sure?"
+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 ""
+"This account's default language for e-mails and preferred language for "
+"site presentation."
+msgstr ""
+
+#:  
+msgid "Avatar settings"
+msgstr ""
+
+#:  
+msgid "Create a profile"
+msgstr ""
+
+#:  
+msgid "Upload an avatar"
+msgstr ""
+
+#:  
+msgid "Forum settings"
+msgstr ""
+
+#:  
+msgid "In discussion topics, show at most @comments_per_page"
+msgstr ""
+
+#:  
+msgid "comments per page"
+msgstr ""
+
+#:  
+msgid "Sort comments in discussions"
+msgstr ""
+
+#:  
+msgid "Newest post first"
+msgstr ""
+
+#:  
+msgid "Oldest post first"
+msgstr ""
+
+#:  
+msgid "Signature"
+msgstr ""
+
+#:  
+msgid "Your signature will be publicly displayed at the end of your comments."
+msgstr ""
+
+#:  
+msgid "Hide signatures in forums"
+msgstr ""
+
+#:  
+msgid "Privacy settings"
+msgstr ""
+
+#:  
+msgid "Is it OK for @project and your team (if any) to email you?"
+msgstr ""
+
+#:  
+msgid "Hide"
+msgstr ""
+
+#:  
+msgid "Hide this topic"
+msgstr ""
+
+#:  
+msgid "Lock"
+msgstr ""
+
+#:  
+msgid "Lock this thread for comments"
+msgstr ""
+
+#:  
+msgid "Make sticky"
+msgstr ""
+
+#:  
+msgid "Make this topic sticky"
+msgstr ""
+
+#:  
+msgid "moderation"
+msgstr ""
+
+#:  
+msgid "Post new comment"
+msgstr ""
+
+#:  
+msgid "You must earn 1 more credit!"
+msgstr ""
+
+#:  
+msgid "Joined"
+msgstr ""
+
+#:  
+msgid "Credit"
+msgstr ""
+
+#:  
+msgid "RAC"
+msgstr ""
+
+#:  
+msgid "Join team"
+msgstr ""
+
+#:  
+msgid "Click here to become a member of @this_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 "A discussion forum has been set up for team members."
+msgstr ""
+
+#:  
+msgid "Enter forum"
+msgstr ""
+
+#:  
+msgid "Leave team"
+msgstr ""
+
+#:  
+msgid "Leave this team"
+msgstr ""
+
+#:  
+msgid "Edit message board"
+msgstr ""
+
+#:  
+msgid "Message board title"
+msgstr ""
+
+#:  
+msgid "Text only, no HTML tags"
+msgstr ""
+
+#:  
+msgid "Minimum time between posts"
+msgstr ""
+
+#:  
+msgid "Seconds"
+msgstr ""
+
+#:  
+msgid "Minimum total 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 "Changing the team founder"
+msgstr ""
+
+#:  
+msgid "Any member of the team is eligible"
+msgstr ""
+
+#:  
+msgid "Current founder becomes a normal user"
+msgstr ""
+
+#:  
+msgid "It must be 60 days since any previous request"
+msgstr ""
+
+#:  
+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 "Change the team founder"
+msgstr ""
+
+#:  
+msgid "Add / Remove team admins"
+msgstr ""
+
+#:  
+msgid "Choose type"
+msgstr ""
+
+#:  
+msgid "Team name"
+msgstr ""
+
+#:  
+msgid "Team name -- HTML version (optional)"
+msgstr ""
+
+#:  
+msgid "You may use limited HTML tags"
+msgstr ""
+
+#:  
+msgid "Team website (optional)"
+msgstr ""
+
+#:  
+msgid "Displayed on the team's page"
+msgstr ""
+
+#:  
+msgid "Type of team"
+msgstr ""
+
+#:  
+msgid "Accept new members?"
+msgstr ""
+
+#:  
+msgid "Description of team"
+msgstr ""
+
+#:  
+msgid "Create new team"
+msgstr ""
+
+#:  
+msgid "Create a team"
+msgstr ""
+
+#:  
+msgid "Save team"
+msgstr ""
+
+#:  
+msgid "Create team message board"
+msgstr ""
+
+#:  
+msgid "Create message board"
+msgstr ""
+
+#:  
+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 "Anonymous"
+msgstr ""
+
+#:  
+msgid "Unpublished"
+msgstr ""
+
+#:  
+msgid "Sorry, unrecognized email address or password."
+msgstr ""
+
+#:  
+msgid "Have you forgotten your password?"
+msgstr ""
+
+#:  
+msgid "Id"
+msgstr ""
+
+#:  
+msgid "Recent average credit"
+msgstr ""
+
+#:  
+msgid "Members"
+msgstr ""
+
+#:  
+msgid "Total Credit"
+msgstr ""
+
+#:  
+msgid "User ID"
+msgstr ""
+
+#:  
+msgid "User"
+msgstr ""
+
+#:  
+msgid "Admin since"
+msgstr ""
+
+#:  
+msgid "Team ID"
+msgstr ""
+
+#:  
+msgid "User joined"
+msgstr ""
+
+#:  
+msgid "Timestamp"
+msgstr ""
+
+#:  
+msgid "Account Key"
+msgstr ""
+
+#:  
+msgid "CPID"
+msgstr ""
+
+#:  
+msgid "Email Address"
+msgstr ""
+
+#:  
+msgid "Password Hash"
+msgstr ""
+
+#:  
+msgid "Postal Code"
+msgstr ""
+
+#:  
+msgid "Send Email"
+msgstr ""
+
+#:  
+msgid "Show Hosts"
+msgstr ""
+
+#:  
+msgid "URL"
+msgstr ""
+
+#:  
+msgid "Computer ID"
+msgstr ""
+
+#:  
+msgid "Location"
+msgstr ""
+
+#:  
+msgid "While BOINC running, % of time work is allowed"
+msgstr ""
+
+#:  
+msgid "Average turnaround time"
+msgstr ""
+
+#:  
+msgid "Created"
+msgstr ""
+
+#:  
+msgid "While BOINC running, % of time host has an Internet connection"
+msgstr ""
+
+#:  
+msgid "Average CPU efficiency"
+msgstr ""
+
+#:  
+msgid "Free disk space"
+msgstr ""
+
+#:  
+msgid "Total disk space"
+msgstr ""
+
+#:  
+msgid "Task duration correction factor"
+msgstr ""
+
+#:  
+msgid "Avg. credit"
+msgstr ""
+
+#:  
+msgid "External IP address"
+msgstr ""
+
+#:  
+msgid "Cross project ID"
+msgstr ""
+
+#:  
+msgid "Last IP address"
+msgstr ""
+
+#:  
+msgid "Cache"
+msgstr ""
+
+#:  
+msgid "Memory"
+msgstr ""
+
+#:  
+msgid "Swap space"
+msgstr ""
+
+#:  
+msgid "Average download rate"
+msgstr ""
+
+#:  
+msgid "Average upload rate"
+msgstr ""
+
+#:  
+msgid "Same IP address count"
+msgstr ""
+
+#:  
+msgid "% of time BOINC client is running"
+msgstr ""
+
+#:  
+msgid "Operating system"
+msgstr ""
+
+#:  
+msgid "Operating system version"
+msgstr ""
+
+#:  
+msgid "Measured floating point speed"
+msgstr ""
+
+#:  
+msgid "Measured integer speed"
+msgstr ""
+
+#:  
+msgid "CPU model"
+msgstr ""
+
+#:  
+msgid "Number of processors"
+msgstr ""
+
+#:  
+msgid "CPU"
+msgstr ""
+
+#:  
+msgid "Number of times client has contacted server"
+msgstr ""
+
+#:  
+msgid "Last contact"
+msgstr ""
+
+#:  
+msgid "Serial number"
+msgstr ""
+
+#:  
+msgid "Timezone"
+msgstr ""
+
+#:  
+msgid "Platform ID"
+msgstr ""
+
+#:  
+msgid "Task ID"
+msgstr ""
+
+#:  
+msgid "Workunit ID"
+msgstr ""
+
+#:  
+msgid "Host ID"
+msgstr ""
+
+#:  
+msgid "Application ID"
+msgstr ""
+
+#:  
+msgid "Application version"
+msgstr ""
+
+#:  
+msgid "Claimed credit"
+msgstr ""
+
+#:  
+msgid "Client state"
+msgstr ""
+
+#:  
+msgid "CPU time"
+msgstr ""
+
+#:  
+msgid "Run time"
+msgstr ""
+
+#:  
+msgid "Exit status"
+msgstr ""
+
+#:  
+msgid "Granted credit"
+msgstr ""
+
+#:  
+msgid "Outcome"
+msgstr ""
+
+#:  
+msgid "Report deadline"
+msgstr ""
+
+#:  
+msgid "Sent"
+msgstr ""
+
+#:  
+msgid "Server state"
+msgstr ""
+
+#:  
+msgid "Stderr out"
+msgstr ""
+
+#:  
+msgid "Validation state"
+msgstr ""
+
+#:  
+msgid "Canonical credit"
+msgstr ""
+
+#:  
+msgid "Canonical result ID"
+msgstr ""
+
+#:  
+msgid "Created time"
+msgstr ""
+
+#:  
+msgid "Needs validation"
+msgstr ""
+
+#:  
+msgid "Initial replication"
+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 ""
+
+#:  
+msgid "hours"
+msgstr ""
+
+#:  
+msgid "Remove friend"
+msgstr ""
+
+#:  
+msgid "Ban user"
+msgstr ""
+
+#:  
+msgid "Add as friend"
+msgstr ""
+
+#:  
+msgid "Team"
+msgstr ""
+
+#:  
+msgid "Reply"
+msgstr ""
+
+#:  
+msgid "Reply to this comment"
+msgstr ""
+
+#:  
+msgid "Quote"
+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 "Details"
+msgstr ""
+
+#:  
+msgid "Make unsticky"
+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 ""
+
+#:  
+msgid "Remove"
+msgstr ""
+
+#:  
+msgid "hidden"
+msgstr ""
+
diff --git a/locale/templates/BOINC-Manager.pot b/locale/templates/BOINC-Manager.pot
index 99ffcbb..22f1ab5 100644
--- a/locale/templates/BOINC-Manager.pot
+++ b/locale/templates/BOINC-Manager.pot
@@ -7,22 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC 7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-24 13:36-0500\n"
-"PO-Revision-Date: 2015-03-24 13:37-0500\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-01 17:09-0500\n"
 "Last-Translator: Rom Walton <rwalton at ssl.berkeley.edu>\n"
 "Language-Team: BOINC Localization Team <boinc_loc at ssl.berkeley.edu>\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"
-"X-Poedit-SearchPath-3: clientgui\\mac\n"
-"X-Poedit-SearchPath-4: clientgui\\msw\n"
+"X-Poedit-SearchPath-3: clientgui\\msw\n"
+"X-Poedit-SearchPath-4: clientgui\\mac\n"
 
 #: clientgui/AccountInfoPage.cpp:361
 #, c-format
@@ -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
@@ -201,365 +203,368 @@ msgstr ""
 msgid "Disconnected"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:325
+#: clientgui/AdvancedFrame.cpp:327
 #, c-format
 msgid "New %s window..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:329
+#: clientgui/AdvancedFrame.cpp:331
 #, c-format
 msgid "Open another %s window"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: clientgui/AdvancedFrame.cpp:351
+#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
 #, c-format
 msgid "Close the %s window"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:354
+#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
 msgid "&Close window"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:429
 msgid "Show disk usage"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:432
-msgid "Event Log...\tCtrl+Shift+E"
+#: clientgui/AdvancedFrame.cpp:436
+msgid "Simple &View...\tCtrl+Shift+V"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:433
-msgid "Show diagnostic messages"
+#: clientgui/AdvancedFrame.cpp:437
+msgid "Switch to the Simple View"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:439
-msgid "Simple &View...\tCtrl+Shift+V"
+#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:440
-msgid "Switch to the Simple View"
+#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:454
-msgid "&Add project or account manager..."
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:459
+#: clientgui/AdvancedFrame.cpp:461
 #, c-format
 msgid "&Synchronize with %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:463
+#: clientgui/AdvancedFrame.cpp:465
 #, c-format
 msgid "Get current settings from %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:473
-msgid "&Add project..."
-msgstr ""
-
-#: 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 ""
 
-#: 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 ""
 
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:492
 msgid "Run tests that measure CPU speed"
 msgstr ""
 
-#: 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 ""
+
 #: clientgui/AdvancedFrame.cpp:503
+msgid "Show diagnostic messages"
+msgstr ""
+
+#: clientgui/AdvancedFrame.cpp:511
 msgid "&Run always"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:548
 msgid "Allow GPU work regardless of preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:552
 msgid "Use GPU based on preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:553
 msgid "Allow GPU work according to preferences"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:557
 msgid "Suspend GPU"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:558
 msgid "Stop GPU work regardless of preferences"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
 #, c-format
 msgid "%s &help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:640
+#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
 #, c-format
 msgid "Show information about %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:658
 #, c-format
 msgid "&%s help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:654
+#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
 msgid "Show information about the %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:665
+#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
 #, c-format
 msgid "%s &web site"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:669
+#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:709
 msgid "&Activity"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
 msgid "&Options"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
 msgid "&Tools"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1188
+#: clientgui/AdvancedFrame.cpp:1235
 #, c-format
 msgid "%s - Stop using %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1193
+#: clientgui/AdvancedFrame.cpp:1240
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -569,39 +574,39 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1420
+#: clientgui/AdvancedFrame.cpp:1469
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr ""
 
-#: 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 ""
 
-#: clientgui/AdvancedFrame.cpp:1832
+#: clientgui/AdvancedFrame.cpp:1881 clientgui/DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1841
+#: clientgui/AdvancedFrame.cpp:1890
 #, c-format
 msgid "%s has successfully added %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1977
+#: clientgui/AdvancedFrame.cpp:2026
 #, c-format
 msgid "%s - (%s)"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1981
+#: clientgui/AdvancedFrame.cpp:2030
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: clientgui/AdvancedFrame.cpp:1984
+#: clientgui/AdvancedFrame.cpp:2033
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr ""
@@ -649,7 +654,9 @@ msgstr ""
 msgid "%s - Communication"
 msgstr ""
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr ""
 
@@ -661,7 +668,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
@@ -699,7 +707,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
@@ -718,10 +727,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 ""
@@ -806,7 +817,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 ""
 
@@ -816,7 +828,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 ""
 
@@ -868,6 +880,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 ""
@@ -890,15 +903,13 @@ msgstr ""
 msgid "Open %s..."
 msgstr ""
 
-#: 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 ""
 
@@ -906,52 +917,55 @@ msgstr ""
 msgid "E&xit"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:732
 msgid "GPU computing is suspended - "
 msgstr ""
 
-#: 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 ""
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: clientgui/BOINCTaskBar.cpp:813
 msgid "There are new notices - click to view."
 msgstr ""
 
@@ -978,10 +992,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 ""
 
@@ -1012,6 +1024,7 @@ msgstr ""
 msgid "Update completed."
 msgstr ""
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr ""
@@ -1058,50 +1071,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr ""
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr ""
-
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
+msgid "For more information, visit "
 msgstr ""
 
-#: clientgui/DlgAbout.cpp:219
-#: clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120
-#: clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:771
+msgid "Start time must be different from end time"
+msgstr ""
+
+#: clientgui/DlgAdvPreferences.cpp:685
 msgid "Number must be between 0 and 10"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:672
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:772
 msgid "Number must be between 0 and 100"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr ""
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 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:1171
 msgid "Confirmation"
 msgstr ""
 
@@ -1110,430 +1121,469 @@ msgstr ""
 msgid "%s - Computing preferences"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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:215
 msgid "Use web prefs"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 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:688
 msgid "Computing"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#.
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 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/DlgDiagnosticLogFlags.cpp:119
-#: clientgui/DlgExclusiveApps.cpp:146
-#: clientgui/DlgHiddenColumns.cpp:100
+#: clientgui/DlgAdvPreferencesBase.cpp:170
+#: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
+#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:347
 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:357
 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:471
 msgid "Usage limits"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, 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:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, 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:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
-msgid "Check this to suspend computing on portables when running on battery power."
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
+msgid ""
+"Check this to suspend computing on portables when running on battery power."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
-msgid "Check this to suspend computing and file transfers when you're using the computer."
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
+msgid ""
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
-msgid "Store additional tasks above the minimum level.  Determines how much work is requested when contacting a project."
+#: clientgui/DlgAdvPreferencesBase.cpp:384
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is "
+"requested when contacting a project."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
-msgid "This controls how often tasks save their state to disk, so that they can be restarted later."
+#: clientgui/DlgAdvPreferencesBase.cpp:427
+msgid ""
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "Limit usage to"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, 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:481
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Skip data verification for image files"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, c-format
 msgid "Limit the total amount of disk space used by %s."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:530
-#: clientgui/DlgAdvPreferencesBase.cpp:554
+#: clientgui/DlgAdvPreferencesBase.cpp:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, 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:542
+#: clientgui/DlgAdvPreferencesBase.cpp:593
 msgid "Leave at least"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, 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:559
+#: clientgui/DlgAdvPreferencesBase.cpp:610
 #, no-c-format
 msgid "% of total"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 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:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, c-format
 msgid "Limit the memory used by %s when you're not using the computer."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:586
+#: clientgui/DlgAdvPreferencesBase.cpp:637
 msgid "When computer is not in use, use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
-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:647
+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:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr ""
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr ""
 
@@ -1543,30 +1593,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 ""
 
@@ -1575,20 +1622,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 ""
 
@@ -1596,8 +1646,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 ""
 
@@ -1605,18 +1655,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 ""
 
@@ -1624,13 +1677,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 ""
 
@@ -1640,26 +1691,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 ""
 
@@ -1683,8 +1732,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 ""
@@ -1694,8 +1744,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 ""
@@ -1754,10 +1803,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 ""
 
@@ -1776,17 +1824,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 ""
 
@@ -1814,12 +1862,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 ""
 
@@ -1835,7 +1884,7 @@ msgstr ""
 msgid "Team name"
 msgstr ""
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr ""
 
@@ -1863,14 +1912,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 ""
 
@@ -1878,8 +1923,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 ""
 
@@ -1895,8 +1939,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 ""
 
@@ -1956,11 +1999,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 ""
 
@@ -1988,13 +2031,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 ""
 
@@ -2022,12 +2063,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 ""
 
@@ -2091,34 +2132,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 ""
 
@@ -2169,7 +2207,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
@@ -2188,8 +2228,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 ""
 
@@ -2201,15 +2240,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 ""
@@ -2222,18 +2258,15 @@ msgstr ""
 msgid "View and modify your SETI at 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 ""
 
@@ -2241,13 +2274,11 @@ msgstr ""
 msgid "View a listing of all the computers on which you are running SETI at 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 ""
 
@@ -2268,7 +2299,8 @@ msgid "Read a detailed description of the Einstein at Home screensaver"
 msgstr ""
 
 #: clientgui/Localization.cpp:71
-msgid "Correspond with admins and other users on the Einstein at Home message boards"
+msgid ""
+"Correspond with admins and other users on the Einstein at Home message boards"
 msgstr ""
 
 #: clientgui/Localization.cpp:73
@@ -2296,7 +2328,8 @@ msgid "Account summary"
 msgstr ""
 
 #: clientgui/Localization.cpp:95
-msgid "View a listing of all the computers on which you are running Einstein at Home"
+msgid ""
+"View a listing of all the computers on which you are running Einstein at Home"
 msgstr ""
 
 #: clientgui/Localization.cpp:101
@@ -2304,7 +2337,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
@@ -2315,8 +2350,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 ""
 
@@ -2397,7 +2432,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
@@ -2468,8 +2505,7 @@ msgstr ""
 msgid "Downloading"
 msgstr ""
 
-#: clientgui/MainDocument.cpp:2492
-#: clientgui/MainDocument.cpp:2551
+#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
 msgid " (suspended - "
 msgstr ""
 
@@ -2481,6 +2517,9 @@ msgstr ""
 msgid "Task suspended by user"
 msgstr ""
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
+#.
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr ""
@@ -2509,8 +2548,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 ""
 
@@ -2638,7 +2676,7 @@ msgstr ""
 msgid "Categories:"
 msgstr ""
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr ""
 
@@ -2666,14 +2704,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
@@ -2729,7 +2768,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
@@ -2782,8 +2823,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 ""
 
@@ -2795,573 +2835,306 @@ msgstr ""
 msgid "SOCKS proxy"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
 msgstr ""
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
+#: 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/sg_DlgMessages.cpp:146
-msgid "Close"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
 msgstr ""
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
+msgid "'%s' does not contain a valid host name."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid "For additional settings, select Computing Preferences in the Advanced View."
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
+#.
+#. 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 ""
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
 msgstr ""
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr ""
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr ""
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr ""
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr ""
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr ""
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr ""
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr ""
+
+#: clientgui/ViewMessages.cpp:495
+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/sg_ProjectCommandPopup.cpp:67
-msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
+#: 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/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 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."
+#: 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/sg_ProjectCommandPopup.cpp:91
-msgid "Remove this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
+#: 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/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
+#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-msgid "Don't fetch new tasks for this project."
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
+msgid "Status"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
-#, c-format
-msgid "Are you sure you want to reset project '%s'?"
+#: clientgui/ViewProjects.cpp:330
+msgid "Projects"
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
-msgid "Reset Project"
+#: clientgui/ViewProjects.cpp:382
+msgid "Updating project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
-#, c-format
-msgid "Are you sure you want to remove project '%s'?"
+#: clientgui/ViewProjects.cpp:424
+msgid "Resuming project..."
 msgstr ""
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
-msgid "Remove Project"
+#: clientgui/ViewProjects.cpp:428
+msgid "Suspending project..."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
+#: clientgui/ViewProjects.cpp:465
+msgid "Telling project to allow additional task downloads..."
 msgstr ""
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
+#: clientgui/ViewProjects.cpp:469
+msgid "Telling project to not fetch any additional tasks..."
 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 ""
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr ""
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr ""
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr ""
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr ""
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr ""
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr ""
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr ""
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr ""
-
-#: clientgui/ValidateAccountKey.cpp:82
-#: clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr ""
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr ""
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr ""
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr ""
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"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
-msgid "Invalid URL"
-msgstr ""
-
-#: clientgui/ValidateURL.cpp:84
-#: clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr ""
-
-#: clientgui/ValidateURL.cpp:104
-#: clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr ""
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:106
-#: clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:107
-#: clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr ""
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr ""
-
-#: clientgui/ViewProjects.cpp:246
-#: clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr ""
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr ""
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
+#: clientgui/ViewProjects.cpp:505
+msgid "Resetting project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:251
-#: clientgui/ViewTransfers.cpp:215
-#: clientgui/ViewWork.cpp:262
-msgid "Status"
+#: 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:330
-msgid "Projects"
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:235
+msgid "Reset Project"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:382
-msgid "Updating project..."
+#: clientgui/ViewProjects.cpp:563
+msgid "Removing project..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:424
-msgid "Resuming project..."
+#: 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:428
-msgid "Suspending project..."
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:272
+msgid "Remove Project"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:465
-msgid "Telling project to allow additional task downloads..."
+#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
+msgid "Launching browser..."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:469
-msgid "Telling project to not fetch any additional tasks..."
+#: clientgui/ViewProjects.cpp:798 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:505
-msgid "Resetting project..."
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:563
-msgid "Removing project..."
+#: clientgui/ViewProjects.cpp:817 clientgui/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
 msgstr ""
 
-#: clientgui/ViewProjects.cpp:623
-#: clientgui/ViewWork.cpp:686
-msgid "Launching browser..."
+#: clientgui/ViewProjects.cpp:821 clientgui/sg_ProjectCommandPopup.cpp:137
+msgid "Don't fetch new tasks for this project."
 msgstr ""
 
 #: clientgui/ViewProjects.cpp:1140
@@ -3529,13 +3302,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 ""
 
@@ -3563,330 +3334,544 @@ msgstr ""
 msgid "All projects (together)"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2025
-msgid "Show one chart with all projects"
+#: clientgui/ViewStatistics.cpp:2025
+msgid "Show one chart with all projects"
+msgstr ""
+
+#: clientgui/ViewStatistics.cpp:2031
+msgid "All projects (sum)"
+msgstr ""
+
+#: clientgui/ViewStatistics.cpp:2032
+msgid "Show one chart with sum of projects"
+msgstr ""
+
+#: clientgui/ViewStatistics.cpp:2053
+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
+msgid "Updating charts..."
+msgstr ""
+
+#: clientgui/ViewStatistics.cpp:2394
+msgid "Show project list"
+msgstr ""
+
+#: clientgui/ViewStatistics.cpp:2394
+msgid "Uses smaller area for graphs"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:187
+msgid "Retry Now"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:188
+msgid "Retry the file transfer now"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:194
+msgid "Abort Transfer"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:195
+msgid "Abort this file transfer.  You won't get credit for the task."
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:210
+msgid "File"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:211 clientgui/ViewWork.cpp:261
+msgid "Progress"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:212
+msgid "Size"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:213 clientgui/ViewWork.cpp:263
+msgid "Elapsed"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:214
+msgid "Speed"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:295
+msgid "Transfers"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:362
+msgid "Network activity is suspended - "
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:364
+msgid ""
+".\n"
+"You can enable it using the Activity menu."
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:367
+msgid "BOINC"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr ""
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr ""
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr ""
+
+#: 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 ""
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr ""
+
+#: clientgui/ViewWork.cpp:233
+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 ""
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr ""
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr ""
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr ""
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr ""
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr ""
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr ""
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr ""
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+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 ""
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr ""
+
+#: clientgui/ViewWork.cpp:859
+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/ViewStatistics.cpp:2031
-msgid "All projects (sum)"
+#: clientgui/WizardAttach.cpp:571
+msgid "Do you really want to cancel?"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2032
-msgid "Show one chart with sum of projects"
+#: clientgui/WizardAttach.cpp:572
+msgid "Question"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2053
-msgid "Statistics"
+#: clientgui/common/wxPieCtrl.cpp:64 clientgui\common/wxPieCtrl.cpp:64
+msgid "Pie Ctrl"
 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
-msgid "Updating charts..."
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
+msgid "Services"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Show project list"
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
+#, c-format
+msgid "Hide %s"
 msgstr ""
 
-#: clientgui/ViewStatistics.cpp:2394
-msgid "Uses smaller area for graphs"
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
+msgid "Hide Others"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:187
-msgid "Retry Now"
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
+msgid "Show All"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:188
-msgid "Retry the file transfer now"
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
+#, c-format
+msgid "Quit %s"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:194
-msgid "Abort Transfer"
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:195
-msgid "Abort this file transfer.  You won't get credit for the task."
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:210
-msgid "File"
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:211
-#: clientgui/ViewWork.cpp:261
-msgid "Progress"
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:212
-msgid "Size"
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:213
-#: clientgui/ViewWork.cpp:263
-msgid "Elapsed"
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:214
-msgid "Speed"
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:295
-msgid "Transfers"
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:362
-msgid "Network activity is suspended - "
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:364
-msgid ""
-".\n"
-"You can enable it using the Activity menu."
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:367
-msgid "BOINC"
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:360
+#, c-format
+msgid "Get help with %s"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:425
+#: clientgui/sg_DlgMessages.cpp:394
 #, c-format
+msgid "%s - Notices"
+msgstr ""
+
+#: clientgui/sg_DlgPreferences.cpp:206
 msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
+"For additional settings, select Computing Preferences in the Advanced View."
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
+#: clientgui/sg_DlgPreferences.cpp:340
+msgid "GB of disk space"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:868
-msgid "retry in "
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
 msgstr ""
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
+#. 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/ViewWork.cpp:211
-#: clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:212
-#: clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
+#: 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/ViewWork.cpp:265
-msgid "Deadline"
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
 msgstr ""
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:566
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:572
-#, c-format
-msgid "Are you sure you want to abort these %d tasks?"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
 msgstr ""
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
+#: clientgui/sg_TaskPanel.cpp:851
+#, c-format
+msgid "Elapsed: %s"
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:297
+#: clientgui/sg_TaskPanel.cpp:865
 #, 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."
+msgid "Remaining (estimated): %s"
 msgstr ""
 
-#: 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."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
 msgstr ""
 
-#: 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"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
 msgstr ""
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
+#: clientgui/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
 msgstr ""
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
+#: clientgui/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
 msgstr ""
 
-#: clientgui/wizardex.cpp:377
-#: clientgui/wizardex.cpp:553
-msgid "&Next >"
+#: clientgui/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
 msgstr ""
 
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
 msgstr ""
 
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
 msgstr ""
 
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:35
-msgid "Services"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:36
-#, c-format
-msgid "Hide %s"
+#: clientgui/sg_TaskPanel.cpp:1263
+msgid "Unable to connect to the core client"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:37
-msgid "Hide Others"
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
+msgid "&Next >"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:38
-msgid "Show All"
+#: clientgui/wizardex.cpp:383
+msgid "< &Back"
 msgstr ""
 
-#: clientgui/mac/Mac_GUI.cpp:39
-#, c-format
-msgid "Quit %s"
+#: clientgui/wizardex.cpp:553
+msgid "&Finish"
 msgstr ""
 
+#. /////////////////////////////////////////////////////////////////////////
 #: clientgui/DlgAdvPreferencesBase.h:45
 msgid "On this day of the week, compute only during these hours."
 msgstr ""
@@ -3894,4 +3879,3 @@ msgstr ""
 #: clientgui/DlgAdvPreferencesBase.h:46
 msgid "On this day of the week, transfer files only during these hours."
 msgstr ""
-
diff --git a/locale/tr/BOINC-Web.mo b/locale/tr/BOINC-Web.mo
index 5215dd0..412511e 100644
Binary files a/locale/tr/BOINC-Web.mo and b/locale/tr/BOINC-Web.mo differ
diff --git a/locale/tr/BOINC-Web.po b/locale/tr/BOINC-Web.po
index 9d4f172..5228e8c 100644
--- a/locale/tr/BOINC-Web.po
+++ b/locale/tr/BOINC-Web.po
@@ -9,10 +9,10 @@
 # Faruk SARI <faruksari at hotmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2015-02-10 14:33+0000\n"
+"PO-Revision-Date: 2015-05-17 15:28+0000\n"
 "Last-Translator: Faruk SARI <faruksari at hotmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/boinc/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -137,7 +137,7 @@ msgid ""
 " Skype is free (both the software and the calls).  If you don't already have"
 " Skype, please %sdownload and install it now%s.  When you're finished, "
 "return to this page."
-msgstr "BOINC Online Yardım, %sSkype%s tabanlı bir İnternet telefonu sistemidir. Skype bedavadır (yazılım ve görüşmeler). Eğer Skype'a sahip değilseniz, lütfen şimdi %sindirip kurun%s.  Tamamladığınızda, bu sayfaya geri dönün."
+msgstr "BOINC Online Yardım, %sSkype%s tabanlı bir İnternet telefonu sistemidir. Skype bedavadır (yazılım ve görüşmeler). Eğer Skype'a sahip değilseniz, lütfen şimdi %s indirip kurun%s.  Tamamladığınızda, bu sayfaya geri dönün."
 
 #: help.php:28
 msgid ""
@@ -847,7 +847,7 @@ msgstr "Kuantum bilgisayar simülasyonu; Goldbach Hipotezi (Varsayımı)."
 
 #: projects.inc:450 projects.inc:458
 msgid "Cryptography"
-msgstr "Kriptografi"
+msgstr "Şifre Bilimi"
 
 #: projects.inc:459
 msgid ""
diff --git a/locale/uk/BOINC-Setup.mo b/locale/uk/BOINC-Setup.mo
index c1aac21..0113ff6 100644
Binary files a/locale/uk/BOINC-Setup.mo and b/locale/uk/BOINC-Setup.mo differ
diff --git a/locale/uk/BOINC-Setup.po b/locale/uk/BOINC-Setup.po
index fa4eedf..bf719f5 100644
--- a/locale/uk/BOINC-Setup.po
+++ b/locale/uk/BOINC-Setup.po
@@ -5,11 +5,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-26 00:00-0800\n"
-"PO-Revision-Date: 2015-02-09 01:30+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"PO-Revision-Date: 2015-04-20 12:34+0000\n"
+"Last-Translator: Rom Walton\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/boinc/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/uk/BOINC-Web.mo b/locale/uk/BOINC-Web.mo
index b157a0c..8e27da1 100644
Binary files a/locale/uk/BOINC-Web.mo and b/locale/uk/BOINC-Web.mo differ
diff --git a/locale/uk/BOINC-Web.po b/locale/uk/BOINC-Web.po
index 4e1d807..4855f49 100644
--- a/locale/uk/BOINC-Web.po
+++ b/locale/uk/BOINC-Web.po
@@ -8,11 +8,11 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2015-02-09 01:29+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"PO-Revision-Date: 2015-04-22 12:56+0000\n"
+"Last-Translator: Rom Walton\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/boinc/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/zh_CN/BOINC-Drupal.po b/locale/zh_CN/BOINC-Drupal.po
new file mode 100644
index 0000000..cab5c04
--- /dev/null
+++ b/locale/zh_CN/BOINC-Drupal.po
@@ -0,0 +1,1432 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME <EMAIL at ADDRESS>
+# 
+# Translators:
+# Yin Gang <zenith.yin at gmail.com>, 2015
+# 秦赫阳 <qysnn1 at gmail.com>, 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 <zenith.yin at gmail.com>\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 <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, it will be used for your user picture."
+msgstr "如果你有一个<a href=\"@gravatar-check\">正确的 Gravatar</a> 和你的电子邮件地址关联,它将被用作你的用户图片。"
+
+msgid "Your Gravatar will not be shown if you upload a user picture."
+msgstr "如果你上传了一张用户图片,则不会显示你的 Gravatar。"
+
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, use it for your user picture."
+msgstr "如果你有一个<a href=\"@gravatar-check\">正确的 Gravatar</a> 与你的电子邮件地址关联,它将被用作你的用户图片。"
+
+msgid "Gravatar will not be shown if an avatar is uploaded."
+msgstr "如果上传了头像,则不会显示 Gravatar。"
+
+msgid "This is not available until your profile is set up."
+msgstr "仅在你的档案创建后才可用。"
+
+msgid "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 at 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 at 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 <i>Add\n"
+"      Project</i>."
+msgstr "如果你已经在使用 BOINC,选择<i>增加项目</i>。"
+
+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.mo b/locale/zh_CN/BOINC-Manager.mo
index 73dccde..4adf1db 100644
Binary files a/locale/zh_CN/BOINC-Manager.mo and b/locale/zh_CN/BOINC-Manager.mo differ
diff --git a/locale/zh_CN/BOINC-Manager.po b/locale/zh_CN/BOINC-Manager.po
index 3e4a310..0a33d86 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 <zenith.yin at gmail.com>, 2015
 # 周潇波 <zhouxiaobo.500 at gmail.com>, 2015
 # 秦赫阳 <qysnn1 at gmail.com>, 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-03-25 11:40+0000\n"
-"Last-Translator: 秦赫阳 <qysnn1 at gmail.com>\n"
+"POT-Creation-Date: 2015-05-01 17:08-0500\n"
+"PO-Revision-Date: 2015-05-03 00:32+0000\n"
+"Last-Translator: Yin Gang <zenith.yin at gmail.com>\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:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "增加一个项目"
+
+#: clientgui/AdvancedFrame.cpp:456
+msgid "&Use account manager..."
+msgstr "使用账户管理器(&U)..."
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "添加一个新的科学项目,或使用帐户管理器"
+#: clientgui/AdvancedFrame.cpp:457
+msgid "Use an account manager to control this computer."
+msgstr "使用账户管理器来控制该计算机。"
 
-#: clientgui/AdvancedFrame.cpp:459
+#: 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,9 @@ msgstr "退出 %s (&X)"
 msgid "%s - Communication"
 msgstr "%s - 网络通讯"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:351
 msgid "Cancel"
 msgstr "取消"
 
@@ -724,6 +734,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 +819,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 +830,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 +882,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 +905,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 +919,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 +1026,7 @@ msgstr "从 %s 的更新已完成。"
 msgid "Update completed."
 msgstr "更新已完成。"
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "当前正在使用帐户管理器"
@@ -1056,48 +1073,48 @@ msgid "BOINC is distributed under the GNU Lesser General Public License v3.0."
 msgstr "BOINC以GNU较宽松通用公共许可证 (LGPL) v3.0为授权协议而发布"
 
 #: clientgui/DlgAbout.cpp:203
-msgid "Visit "
-msgstr "访问"
+msgid "For more information, visit "
+msgstr "要获取更多信息,请访问"
 
-#: clientgui/DlgAbout.cpp:211
-msgid "for more information."
-msgstr "以获取更多的信息。"
-
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
 #: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "确定(&O)"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:769
 msgid "Invalid number"
 msgstr "无效的数字"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:770
 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:771
+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:772
 msgid "Number must be between 0 and 100"
 msgstr "数字必须介于 0 和 100 之间"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:843
 msgid "invalid input value detected"
 msgstr "检测到错误的输入值"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:845
 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:1171
 msgid "Confirmation"
 msgstr "确认"
 
@@ -1106,106 +1123,111 @@ 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:215
 msgid "Use web prefs"
 msgstr "使用项目网站上的设置"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
 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:688
 msgid "Computing"
 msgstr "正在计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:151
+#: clientgui/DlgAdvPreferencesBase.cpp:836
 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:347
 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:357
 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:471
 msgid "Usage limits"
 msgstr "使用率限制"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:249
 #, 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:251
+#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:302
 msgid "Use at most"
 msgstr "最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:256
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "%的CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:300
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1213,342 +1235,355 @@ msgid ""
 "and repeat."
 msgstr "每隔几秒钟就暂停一下然后恢复计算,以降低CPU温度并减少电能使用。比如:75%意味着每计算 3 秒就暂停 1 秒,然后如此重复。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:307
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% 的处理器时间"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:275
 msgid "When to suspend"
 msgstr "以下情况暂停计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
 msgid "Suspend when computer is on battery"
 msgstr "当计算机正在使用电池供电时暂停计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "勾选这个选项以使得笔记本电脑在靠电池电源运行时暂停计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:290 clientgui/sg_DlgPreferences.cpp:251
 msgid "Suspend when computer is in use"
 msgstr "当计算机正在使用时暂停计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "勾选这个选项以使得当您使用计算机时暂停计算和文件传输。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:299
 msgid "Suspend GPU computing when computer is in use"
 msgstr "当使用计算机时暂停 GPU 计算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:302
 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:307 clientgui/sg_DlgPreferences.cpp:262
 msgid "This determines when the computer is considered 'in use'."
 msgstr "这将确定在怎样的情况下计算机会被视为“正在使用”。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "如果在最近的多少分钟内有鼠标或键盘操作则认为计算机在使用中"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
 msgid "minutes"
 msgstr "分钟"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "当非%s CPU使用率高于多少时暂停"
+#: clientgui/DlgAdvPreferencesBase.cpp:331
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "当非BOINC CPU使用率高于多少时暂停"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:323
+#: clientgui/DlgAdvPreferencesBase.cpp:333
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "当您的计算机正忙于运行其他程序时暂停计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:357
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Other"
 msgstr "其它"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:363
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "存储至少足够使计算机计算如此长时间的任务。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:367
 msgid "Store at least"
 msgstr "至少存储"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:378
+#: clientgui/DlgAdvPreferencesBase.cpp:400
 msgid "days of work"
 msgstr "天的工作"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:384
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
 msgstr "在最低限度之上额外存储一些任务。这将决定BOINC客户端在联系一个项目时要求多少新任务。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:388
 msgid "Store up to an additional"
 msgstr "额外存储"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:407
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "如果您同时运行几个项目,%s 将每隔这么长时间切换一次任务。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:412
 msgid "Switch between tasks every"
 msgstr "每隔多少分钟切换任务"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:427
 msgid ""
 "This controls how often tasks save their state to disk, so that they can be "
 "restarted later."
 msgstr "这个选项决定计算任务向磁盘保存其进度的频繁程度,以便于之后重新启动。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:431
 msgid "Request tasks to checkpoint at most every"
 msgstr "要求任务每隔多少分钟储存一次进度"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:440
 msgid "seconds"
 msgstr "秒"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:477
 msgid "Limit the download rate of file transfers."
 msgstr "限制文件传输的下载速率。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit download rate to"
 msgstr "限制下载速度为"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:482
+#: clientgui/DlgAdvPreferencesBase.cpp:491
 msgid "KB/second"
 msgstr "KB每秒"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:486
 msgid "Limit the upload rate of file transfers."
 msgstr "限制文件传输的上传速率。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:487
 msgid "Limit upload rate to"
 msgstr "限制上传速率为"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:498
 #, 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:500
 msgid "Limit usage to"
 msgstr "限制使用量为"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:504
 msgid "MB every"
 msgstr "MB 每"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:508
 msgid "days"
 msgstr "天"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:530
 #, 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:532
 msgid "Skip data verification for image files"
 msgstr "跳过图像文件的数据校验"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:536
 msgid "Confirm before connecting to Internet"
 msgstr "接入互联网前先确认"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:537
+#: clientgui/DlgAdvPreferencesBase.cpp:541
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr "仅 Modem、ISDN 和 VPN 用户需要使用该设置"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:540
 msgid "Disconnect when done"
 msgstr "传输完成后断开连接"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "磁盘"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:572
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%s 将使用这些设置中最严格的设置:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:578 clientgui/sg_DlgPreferences.cpp:329
 #, 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:581
+#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:332
 msgid "Use no more than"
 msgstr "最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:590
 #, 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:593
 msgid "Leave at least"
 msgstr "至少保留"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:597
 msgid "GB free"
 msgstr "GB可用空间"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, 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:610
 #, no-c-format
 msgid "% of total"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:617
 msgid "Memory"
 msgstr "内存(RAM)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:622
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "限制当您使用计算机时%s 使用的内存。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:624
 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:630
+#: clientgui/DlgAdvPreferencesBase.cpp:642
+#: clientgui/DlgAdvPreferencesBase.cpp:658
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:635
 #, 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:637
 msgid "When computer is not in use, use at most"
 msgstr "当计算机未在使用时,最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:646
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "在暂停时将非GPU任务留在内存中"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:647
 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:651
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "限制 %s 使用的交换空间 (页面文件)大小。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:653
 msgid "Page/swap file: use at most"
 msgstr "虚拟内存:最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:279
 msgid "and"
 msgstr "到"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:679
 msgid "to"
 msgstr "至"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:692 clientgui/sg_DlgPreferences.cpp:281
 msgid "Compute only during a particular period each day."
 msgstr "仅在每天的特定时间段内计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:695 clientgui/sg_DlgPreferences.cpp:284
 msgid "Compute only between"
 msgstr "仅在如下时间段内计算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:705
+#: clientgui/DlgAdvPreferencesBase.cpp:852
 msgid "Day-of-week override"
 msgstr "自定义每周内各天的可用时间段:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:709
+#: clientgui/DlgAdvPreferencesBase.cpp:856
 msgid "Override the times above on the selected days:"
 msgstr "在一周选定的各天自定义上述时间设置"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:873
 msgid "Monday"
 msgstr "周一"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:742
+#: clientgui/DlgAdvPreferencesBase.cpp:888
 msgid "Friday"
 msgstr "周五"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:755
+#: clientgui/DlgAdvPreferencesBase.cpp:901
 msgid "Tuesday"
 msgstr "周二"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:770
+#: clientgui/DlgAdvPreferencesBase.cpp:916
 msgid "Saturday"
 msgstr "周六"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:783
+#: clientgui/DlgAdvPreferencesBase.cpp:929
 msgid "Wednesday"
 msgstr "周三"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:798
+#: clientgui/DlgAdvPreferencesBase.cpp:944
 msgid "Sunday"
 msgstr "周日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:811
+#: clientgui/DlgAdvPreferencesBase.cpp:957
 msgid "Thursday"
 msgstr "周四"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:840 clientgui/sg_DlgPreferences.cpp:311
 msgid "Transfer files only during a particular period each day."
 msgstr "仅在每天的特定时间段内传输文件。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:842 clientgui/sg_DlgPreferences.cpp:313
 msgid "Transfer files only between"
 msgstr "传输文件的时间段:"
 
@@ -1587,15 +1622,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 +1647,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 +1656,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 +1664,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 +1706,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 +1734,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 +1807,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 +1864,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 +1886,7 @@ msgstr "用户名称"
 msgid "Team name"
 msgstr "团队名称"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:247 clientgui/ViewProjects.cpp:250
 msgid "Resource share"
 msgstr "资源分享"
 
@@ -1953,11 +2001,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 +2065,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 +2139,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 +2152,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 +2353,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 +2519,8 @@ msgstr "项目已被用户暂停"
 msgid "Task suspended by user"
 msgstr "任务已被用户暂停"
 
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2507
 msgid "Suspended - "
 msgstr "已暂停 - "
@@ -2622,7 +2677,7 @@ msgstr "要选择一个项目,请点击它的项目名称或在下方输入它
 msgid "Categories:"
 msgstr "类别:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "项目:"
 
@@ -2781,528 +2836,230 @@ msgstr "自动检测"
 msgid "SOCKS proxy"
 msgstr "SOCKS 代理"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "皮肤"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "使用协议"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "选择用户界面的外观。"
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "请阅读以下的使用协议:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "显示诊断消息。"
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "我同意该使用协议。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "高级视图...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "我不同意该用户条款。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "显示高级图形界面。"
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "项目已暂停服务"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "配置界面及代理服务器选项"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "项目已暂停服务。\n\n请稍后重试。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "帐户管理器已暂停服务"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "缺省"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "帐户管理器已暂停服务。\n\n请稍后重试。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "暂停"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "请输入帐户密钥以继续。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "暂停计算"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "此帐户密钥错误;请输入一个正确的帐户密钥"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "继续计算"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "验证冲突"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "通知"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "请指定一个电子邮件地址"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "打开一个窗口,查看来自计算网站或 BOINC 网站的通知消息。"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "此电子邮件地址错误;请输入一个正确的电子邮件地址"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "获取 %s 的帮助信息"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "网址不存在"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "获取通知中,请稍候..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "请输入一个网址。\n例如:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-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
+msgid "Invalid URL"
+msgstr "错误的网址"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "关闭"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "请输入一个正确的网址。\n比如:\nhttp://boincproject.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "%s - 通知"
+msgid "'%s' does not contain a valid host name."
+msgstr "'%s'中未包含正确的主机名称。"
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "更多的参数设置,请在高级视图下选择“计算参数设置”来查看。"
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "'%s'中未包含正确的路径。"
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "GB 的磁盘空间"
+#. 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 "命令"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s -计算参数设置"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "复制所有消息"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "放弃所有本地设置并使用网站上的设置吗?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "复制选中的消息"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "仅显示当前项目"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "仅显示当前选中项目的消息。"
+
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "消息"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "复制所有消息至剪贴板..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "复制选中的消息到剪贴板..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "正在过滤消息..."
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "显示所有消息"
+
+#: clientgui/ViewMessages.cpp:495
+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/sg_ProjectCommandPopup.cpp:66
+#: 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/sg_ProjectCommandPopup.cpp:67
+#: 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/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:211 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "该项目不再下载任何新任务。"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "重置项目"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: 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/sg_ProjectCommandPopup.cpp:91
+#: 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/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:232 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/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "帐户"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "允许当前项目下载新任务。"
+#: clientgui/ViewProjects.cpp:248
+msgid "Work done"
+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 "使用协议"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "请阅读以下的使用协议:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "我同意该使用协议。"
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "我不同意该用户条款。"
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "项目已暂停服务"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "项目已暂停服务。\n\n请稍后重试。"
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "帐户管理器已暂停服务"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "帐户管理器已暂停服务。\n\n请稍后重试。"
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "请输入帐户密钥以继续。"
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "此帐户密钥错误;请输入一个正确的帐户密钥"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "验证冲突"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "请指定一个电子邮件地址"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "此电子邮件地址错误;请输入一个正确的电子邮件地址"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "网址不存在"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "请输入一个网址。\n例如:\nhttp://www.example.com/"
-
-#: 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:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "请输入一个正确的网址。\n比如:\nhttp://boincproject.example.com/"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "'%s'中未包含正确的主机名称。"
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "'%s'中未包含正确的路径。"
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "命令"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "复制所有消息"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "复制选中的消息"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "仅显示当前项目"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "仅显示当前选中项目的消息。"
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "消息"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "复制所有消息至剪贴板..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "复制选中的消息到剪贴板..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "正在过滤消息..."
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "显示所有消息"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "显示所有项目的消息。"
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "帐户"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "总积分"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "近期平均积分"
+#: clientgui/ViewProjects.cpp:249
+msgid "Avg. work done"
+msgstr "近期平均积分"
 
 #: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
@@ -3337,14 +3094,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 "用户发起的请求"
@@ -3628,195 +3419,444 @@ msgstr "。\n你可以在“活动”菜单中重新启用它。"
 msgid "BOINC"
 msgstr "BOINC"
 
-#: clientgui/ViewTransfers.cpp:374
-msgid "Retrying transfer now..."
-msgstr "正在重试传输..."
+#: clientgui/ViewTransfers.cpp:374
+msgid "Retrying transfer now..."
+msgstr "正在重试传输..."
+
+#: clientgui/ViewTransfers.cpp:412
+msgid "Aborting transfer..."
+msgstr "中断传输..."
+
+#: clientgui/ViewTransfers.cpp:425
+#, c-format
+msgid ""
+"Are you sure you want to abort this file transfer '%s'?\n"
+"NOTE: Aborting a transfer will invalidate a task and you\n"
+"will not receive credit for it."
+msgstr "您确信要中断文件'%s'的传输吗?\n注意:中断传输将标识该任务为无效,您将不能从该任务得到积分。"
+
+#: clientgui/ViewTransfers.cpp:431
+msgid "Abort File Transfer"
+msgstr "中断文件传输"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Upload"
+msgstr "上传"
+
+#: clientgui/ViewTransfers.cpp:864
+msgid "Download"
+msgstr "下载"
+
+#: clientgui/ViewTransfers.cpp:868
+msgid "retry in "
+msgstr "稍后重试 "
+
+#: clientgui/ViewTransfers.cpp:870
+msgid "failed"
+msgstr "失败"
+
+#: clientgui/ViewTransfers.cpp:873
+msgid "suspended"
+msgstr "暂停"
+
+#: clientgui/ViewTransfers.cpp:878
+msgid "active"
+msgstr "处理中"
+
+#: clientgui/ViewTransfers.cpp:880
+msgid "pending"
+msgstr "等待中"
+
+#: clientgui/ViewTransfers.cpp:887
+msgid " (project backoff: "
+msgstr "(项目延后:"
+
+#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
+msgid "Show active tasks"
+msgstr "显示活动任务"
+
+#: 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 "显示虚拟机控制台"
+
+#: clientgui/ViewWork.cpp:226
+msgid "Show VM Console in a window."
+msgstr "在窗口里显示虚拟机控制台。"
+
+#: clientgui/ViewWork.cpp:233
+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 "剩余时间(估计)"
+
+#: clientgui/ViewWork.cpp:265
+msgid "Deadline"
+msgstr "上报期限"
+
+#: clientgui/ViewWork.cpp:351
+msgid "Tasks"
+msgstr "任务"
+
+#: clientgui/ViewWork.cpp:444
+msgid "Resuming task..."
+msgstr "正在继续该任务..."
+
+#: clientgui/ViewWork.cpp:447
+msgid "Suspending task..."
+msgstr "正在暂停该任务..."
+
+#: clientgui/ViewWork.cpp:476
+msgid "Showing graphics for task..."
+msgstr "正在显示该任务的图形..."
+
+#: clientgui/ViewWork.cpp:513
+msgid "Showing VM console for task..."
+msgstr "显示指定任务的虚拟机控制台..."
+
+#: clientgui/ViewWork.cpp:566
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s, Status: %s)"
+msgstr "您确定要中止当前任务'%s'吗?\n(进度:%s,状态:%s)"
+
+#: clientgui/ViewWork.cpp:572
+#, c-format
+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 "中止任务..."
+
+#: clientgui/ViewWork.cpp:858
+msgid "Show all tasks"
+msgstr "显示所有任务"
+
+#: clientgui/ViewWork.cpp:859
+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:571
+msgid "Do you really want to cancel?"
+msgstr "您确定要取消吗?"
+
+#: clientgui/WizardAttach.cpp:572
+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:360
+#, 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:340
+msgid "GB of disk space"
+msgstr "GB 的磁盘空间"
+
+#: clientgui/sg_DlgPreferences.cpp:1089
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s -计算参数设置"
+
+#: clientgui/sg_DlgPreferences.cpp:1170
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "放弃所有本地设置并使用网站上的设置吗?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "增加项目"
 
-#: clientgui/ViewTransfers.cpp:412
-msgid "Aborting transfer..."
-msgstr "中断传输..."
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "同步"
 
-#: clientgui/ViewTransfers.cpp:425
-#, c-format
-msgid ""
-"Are you sure you want to abort this file transfer '%s'?\n"
-"NOTE: Aborting a transfer will invalidate a task and you\n"
-"will not receive credit for it."
-msgstr "您确信要中断文件'%s'的传输吗?\n注意:中断传输将标识该任务为无效,您将不能从该任务得到积分。"
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "已为该项目完成的任务"
 
-#: clientgui/ViewTransfers.cpp:431
-msgid "Abort File Transfer"
-msgstr "中断文件传输"
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "志愿加入到一个或多个分布在许多不同科学领域内的研究项目"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Upload"
-msgstr "上传"
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "从帐户管理系统同步项目"
 
-#: clientgui/ViewTransfers.cpp:864
-msgid "Download"
-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/ViewTransfers.cpp:868
-msgid "retry in "
-msgstr "稍后重试 "
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "项目网站"
 
-#: clientgui/ViewTransfers.cpp:870
-msgid "failed"
-msgstr "失败"
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "项目命令"
 
-#: clientgui/ViewTransfers.cpp:873
-msgid "suspended"
-msgstr "暂停"
+#: clientgui/sg_ProjectPanel.cpp:276
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "弹出一个 %s 项目的网站菜单"
 
-#: clientgui/ViewTransfers.cpp:878
-msgid "active"
-msgstr "处理中"
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "弹出一个 %s 项目可用的命令菜单"
 
-#: clientgui/ViewTransfers.cpp:880
-msgid "pending"
-msgstr "等待中"
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "暂停该任务。"
 
-#: clientgui/ViewTransfers.cpp:887
-msgid " (project backoff: "
-msgstr "(项目延后:"
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "放弃这个任务,你将得不到相应的任务积分。"
 
-#: clientgui/ViewWork.cpp:211 clientgui/ViewWork.cpp:864
-msgid "Show active tasks"
-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/ViewWork.cpp:212 clientgui/ViewWork.cpp:865
-msgid "Show only active tasks."
-msgstr "只显示正在计算过程中的任务。"
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "您当前没有加入到任何项目,请先加入一个项目。"
 
-#: clientgui/ViewWork.cpp:225
-msgid "Show VM Console"
-msgstr "显示虚拟机控制台"
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "不可用"
 
-#: clientgui/ViewWork.cpp:226
-msgid "Show VM Console in a window."
-msgstr "在窗口里显示虚拟机控制台。"
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "任务:"
 
-#: clientgui/ViewWork.cpp:233
-msgid "Suspend work for this result."
-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/ViewWork.cpp:240
-msgid "Abandon work on the result. You will get no credit for it."
-msgstr "中止该任务,您将不能得到它的积分。"
+#: clientgui/sg_TaskPanel.cpp:497
+msgid "From:"
+msgstr "来自:"
 
-#: clientgui/ViewWork.cpp:264
-msgid "Remaining (estimated)"
-msgstr "剩余时间(估计)"
+#: clientgui/sg_TaskPanel.cpp:551
+msgid "This task's progress"
+msgstr "该计算任务的进度"
 
-#: clientgui/ViewWork.cpp:265
-msgid "Deadline"
-msgstr "上报期限"
+#: clientgui/sg_TaskPanel.cpp:569
+msgid "Task Commands"
+msgstr "任务命令"
 
-#: clientgui/ViewWork.cpp:351
-msgid "Tasks"
-msgstr "任务"
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "弹出一个应用于当前计算任务的命令菜单"
 
-#: clientgui/ViewWork.cpp:444
-msgid "Resuming task..."
-msgstr "正在继续该任务..."
+#: clientgui/sg_TaskPanel.cpp:705
+#, c-format
+msgid "Application: %s"
+msgstr "计算程序:%s"
 
-#: clientgui/ViewWork.cpp:447
-msgid "Suspending task..."
-msgstr "正在暂停该任务..."
+#: clientgui/sg_TaskPanel.cpp:728
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
 
-#: clientgui/ViewWork.cpp:476
-msgid "Showing graphics for task..."
-msgstr "正在显示该任务的图形..."
+#: clientgui/sg_TaskPanel.cpp:736
+msgid "Application: Not available"
+msgstr "计算程序:不可用"
 
-#: clientgui/ViewWork.cpp:513
-msgid "Showing VM console for task..."
-msgstr "显示指定任务的虚拟机控制台..."
+#: clientgui/sg_TaskPanel.cpp:836
+msgid "Not Available"
+msgstr "不可用"
 
-#: clientgui/ViewWork.cpp:566
+#: clientgui/sg_TaskPanel.cpp:851
 #, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %s, Status: %s)"
-msgstr "您确定要中止当前任务'%s'吗?\n(进度:%s,状态:%s)"
+msgid "Elapsed: %s"
+msgstr "已用时:%s"
 
-#: clientgui/ViewWork.cpp:572
+#: clientgui/sg_TaskPanel.cpp:865
 #, c-format
-msgid "Are you sure you want to abort these %d tasks?"
-msgstr "您确定想要中止这 %d 个任务吗?"
+msgid "Remaining (estimated): %s"
+msgstr "剩余时间:%s"
 
-#: clientgui/ViewWork.cpp:586
-msgid "Aborting task..."
-msgstr "中止任务..."
+#: clientgui/sg_TaskPanel.cpp:880
+#, c-format
+msgid "Status: %s"
+msgstr "状态:%s"
 
-#: clientgui/ViewWork.cpp:858
-msgid "Show all tasks"
-msgstr "显示所有任务"
+#: clientgui/sg_TaskPanel.cpp:1228
+msgid "Retrieving current status."
+msgstr "正在获取当前状态。"
 
-#: clientgui/ViewWork.cpp:859
-msgid "Show all tasks."
-msgstr "显示所有的任务。"
+#: clientgui/sg_TaskPanel.cpp:1234
+msgid "Downloading work from the server."
+msgstr "正在从服务器下载任务。"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "增加项目或帐户管理器"
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "暂停计算:电池供电。"
 
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-msgstr "添加项目或使用 BOINC 账户管理器"
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Processing Suspended:  User Active."
+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/sg_TaskPanel.cpp:1243
+msgid "Processing Suspended:  User paused processing."
+msgstr "暂停计算:用户暂停计算。"
 
-#: 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/sg_TaskPanel.cpp:1245
+msgid "Processing Suspended:  Time of Day."
+msgstr "暂停计算: 休息时间段。"
 
-#: 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/sg_TaskPanel.cpp:1247
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "暂停计算:正在运行基准测试。"
 
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "使用 BOINC 账户管理器"
+#: clientgui/sg_TaskPanel.cpp:1249
+msgid "Processing Suspended."
+msgstr "暂停计算。"
 
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "添加或改变你在 World Community Grid 上的项目"
+#: clientgui/sg_TaskPanel.cpp:1253
+msgid "Waiting to contact project servers."
+msgstr "正在等待连接项目服务器。"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "添加其它研究人员或机构运营的项目"
+#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
+msgid "Retrieving current status"
+msgstr "正在获取当前状态"
 
-#: clientgui/WizardAttach.cpp:560
-msgid "Do you really want to cancel?"
-msgstr "您确定要取消吗?"
+#: clientgui/sg_TaskPanel.cpp:1261
+msgid "No work available to process"
+msgstr "无任务可供处理"
 
-#: clientgui/WizardAttach.cpp:561
-msgid "Question"
-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 >"
@@ -3830,32 +3870,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/locale/zh_CN/BOINC-Project-Generic.po b/locale/zh_CN/BOINC-Project-Generic.po
index b44c006..c8fe2e4 100644
--- a/locale/zh_CN/BOINC-Project-Generic.po
+++ b/locale/zh_CN/BOINC-Project-Generic.po
@@ -6,13 +6,15 @@
 # FileID  : $Id$
 # 
 # Translators:
+# 周潇波 <zhouxiaobo.500 at gmail.com>, 2015
+# 秦赫阳 <qysnn1 at gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: boinc\n"
+"Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
-"POT-Creation-Date: 2014-01-10 00:00 PST\n"
-"PO-Revision-Date: 2015-02-09 01:44+0000\n"
-"Last-Translator: Rom Walton <romw at romwnet.org>\n"
+"POT-Creation-Date: 2015-03-04 08:56 PST\n"
+"PO-Revision-Date: 2015-04-29 14:54+0000\n"
+"Last-Translator: 周潇波 <zhouxiaobo.500 at gmail.com>\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"
@@ -27,6 +29,96 @@ msgstr "简体中文"
 msgid "LANG_NAME_INTERNATIONAL"
 msgstr "Simplified Chinese"
 
+#: ../inc/account.inc:38
+msgid "Invitation Code"
+msgstr "邀请码"
+
+#: ../inc/account.inc:38
+msgid "A valid invitation code is required to create an account."
+msgstr "创建帐户时需要一个正确的邀请码。"
+
+#: ../inc/account.inc:44 ../inc/host.inc:674 ../inc/result.inc:632
+#: ../inc/team.inc:219 ../inc/team.inc:367 ../inc/user.inc:198
+#: ../user/account_finish.php:41 ../user/team_admins.php:64
+#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:73
+#: ../user/top_users.php:49 ../user/user_search.php:124
+msgid "Name"
+msgstr "用户名"
+
+#: ../inc/account.inc:44 ../user/account_finish.php:41
+msgid "Identifies you on our web site. Use your real name or a nickname."
+msgstr "你在我们网站上的标识,可以使用你的真实姓名或是昵称。"
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "电子邮件地址"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "必须是有效的电子邮件地址,形式如 '用户名@域名'。"
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "用户口令"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "必须至少包含 %1 个字符"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "确认用户口令"
+
+#: ../inc/account.inc:63 ../inc/team.inc:43 ../inc/team.inc:129
+#: ../inc/team.inc:242 ../inc/team.inc:382 ../inc/team.inc:470
+#: ../inc/user.inc:212 ../inc/user.inc:395 ../user/account_finish.php:45
+#: ../user/edit_user_info_form.php:38 ../user/profile_search_action.php:44
+#: ../user/team_email_list.php:73 ../user/team_search.php:85
+#: ../user/top_users.php:63 ../user/user_search.php:53
+#: ../user/user_search.php:125
+msgid "Country"
+msgstr "国家或地区"
+
+#: ../inc/account.inc:63 ../user/account_finish.php:45
+msgid "Select the country you want to represent, if any."
+msgstr "选择你所希望代表的国家或地区。"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Postal or ZIP Code"
+msgstr "邮编"
+
+#: ../inc/account.inc:70 ../user/account_finish.php:51
+msgid "Optional"
+msgstr "可选的"
+
+#: ../inc/account.inc:86
+msgid "Create account"
+msgstr "创建帐户"
+
+#: ../inc/account.inc:101
+msgid "Email address:"
+msgstr "电子邮件地址:"
+
+#: ../inc/account.inc:103
+msgid "forgot email address?"
+msgstr "忘记了电子邮箱地址?"
+
+#: ../inc/account.inc:106
+msgid "Password:"
+msgstr "用户口令:"
+
+#: ../inc/account.inc:106
+msgid "forgot password?"
+msgstr "忘记了口令?"
+
+#: ../inc/account.inc:109
+msgid "Stay logged in"
+msgstr "保持登录状态"
+
+#: ../inc/account.inc:114 ../inc/util.inc:238 ../user/login_form.php:41
+msgid "Log in"
+msgstr "登录"
+
 #: ../inc/bbcode_html.inc:11
 msgid "Bold text: [b]text[/b]  (alt+b)"
 msgstr "粗体:[b]文本[/b]  (alt+b)"
@@ -37,326 +129,330 @@ msgstr "斜体:[i]文本[/i] (alt+i)"
 
 #: ../inc/bbcode_html.inc:17
 msgid "Underline text: [u]text[/u]  (alt+u)"
-msgstr "强调:[u]文本[/u]  (alt+u)"
+msgstr "下划线:[u]文本[/u]  (alt+u)"
 
 #: ../inc/bbcode_html.inc:20
+msgid "Strikethrough text: [s]text[/s]  (alt+k)"
+msgstr "删除线:[s]文本[/s]  (alt+k)"
+
+#: ../inc/bbcode_html.inc:23
 msgid "Quote text: [quote]text[/quote]  (alt+q)"
 msgstr "引用:[quote]文本[/quote]  (alt+q)"
 
-#: ../inc/bbcode_html.inc:23
+#: ../inc/bbcode_html.inc:26
 msgid "Code display: [code]code[/code]  (alt+c)"
 msgstr "代码:[code]代码[/code]  (alt+c)"
 
-#: ../inc/bbcode_html.inc:26
+#: ../inc/bbcode_html.inc:29
 msgid "List: [list]text[/list] (alt+l)"
 msgstr "列表:[list]文本[/list] (alt+l)"
 
-#: ../inc/bbcode_html.inc:29
+#: ../inc/bbcode_html.inc:32
 msgid "Ordered list: [list=]text[/list]  (alt+o)"
 msgstr "有序列表:[list=]文本[/list]  (alt+o)"
 
-#: ../inc/bbcode_html.inc:32
+#: ../inc/bbcode_html.inc:35
 msgid "Insert image: [img]http://image_url[/img]  (alt+p)"
 msgstr "插入图片:[img]图片网址[/img]  (alt+p)"
 
-#: ../inc/bbcode_html.inc:35
+#: ../inc/bbcode_html.inc:38
 msgid ""
 "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]  (alt+w)"
 msgstr "插入网址:[url]网址[/url] or [url=网址]网址文本[/url]  (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "字体颜色"
 
-#: ../inc/bbcode_html.inc:43
+#: ../inc/bbcode_html.inc:46
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
 msgstr "字体颜色:[color=red]文本[/color]  窍门:你也可以用 #FF0000 来表示红色"
 
-#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
+#: ../inc/bbcode_html.inc:47 ../inc/bbcode_html.inc:62
+#: ../inc/prefs_util.inc:546
 msgid "Default"
 msgstr "缺省"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "深红"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "红"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "橙"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "棕"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "黄"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
 msgstr "绿"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
 msgstr "橄榄"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
 msgstr "蓝绿"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
 msgstr "蓝"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "深蓝"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "靛蓝"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
 msgstr "紫"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
 msgstr "字体大小"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
 msgstr "字体大小:[size=x-small]小号文本[/size]"
 
-#: ../inc/bbcode_html.inc:60
+#: ../inc/bbcode_html.inc:63
 msgid "Small"
 msgstr "小"
 
-#: ../inc/bbcode_html.inc:61
+#: ../inc/bbcode_html.inc:64
 msgid "Normal"
 msgstr "正常"
 
-#: ../inc/bbcode_html.inc:62
+#: ../inc/bbcode_html.inc:65
 msgid "Large"
 msgstr "大"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close all open bbCode tags"
 msgstr "闭合所有的 bbCode 标签"
 
-#: ../inc/bbcode_html.inc:65
+#: ../inc/bbcode_html.inc:68
 msgid "Close Tags"
 msgstr "闭合标签"
 
-#: ../inc/forum.inc:37
+#: ../inc/forum.inc:38
 msgid "Oldest first"
 msgstr "旧帖子显示在前面"
 
-#: ../inc/forum.inc:38 ../inc/forum.inc:44
+#: ../inc/forum.inc:39 ../inc/forum.inc:45
 msgid "Newest first"
 msgstr "新帖子显示在前面"
 
-#: ../inc/forum.inc:39
+#: ../inc/forum.inc:40
 msgid "Highest rated posts first"
 msgstr "评分最高的显示在前面"
 
-#: ../inc/forum.inc:41
+#: ../inc/forum.inc:42
 msgid "Newest post first"
 msgstr "发帖时间最新的在前面"
 
-#: ../inc/forum.inc:42
+#: ../inc/forum.inc:43
 msgid "Most views first"
 msgstr "查看次数最多的在前面"
 
-#: ../inc/forum.inc:43
+#: ../inc/forum.inc:44
 msgid "Most posts first"
 msgstr "回复数量最多的在前面"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search for words in forum messages"
 msgstr "在论坛的所有帖子中搜索关键字"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:126
 msgid "Search forums"
 msgstr "搜索论坛"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:127
 msgid "Advanced search"
 msgstr "高级搜索"
 
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
-#: ../user/pm.php:133
+#: ../inc/forum.inc:133 ../inc/user.inc:325 ../user/pm.php:69
+#: ../user/pm.php:138
 msgid "Private messages"
 msgstr "私人消息"
 
-#: ../inc/forum.inc:151 ../user/bs_sample_index.php:63
-#: ../user/forum_forum.php:71 ../user/sample_index.php:130
+#: ../inc/forum.inc:152 ../user/forum_forum.php:74
+#: ../user/sample_index.php:128
 msgid "Questions and Answers"
 msgstr "疑难解答"
 
-#: ../inc/forum.inc:151 ../inc/forum.inc:183 ../inc/user.inc:250
-#: ../inc/user.inc:375 ../user/bs_sample_index.php:62
-#: ../user/forum_forum.php:73 ../user/sample_index.php:129
-#: ../project.sample/project.inc:43
+#: ../inc/forum.inc:152 ../inc/forum.inc:184 ../inc/user.inc:321
+#: ../inc/user.inc:454 ../user/forum_forum.php:76 ../user/sample_index.php:127
+#: ../project.sample/project.inc:70
 msgid "Message boards"
 msgstr "留言板"
 
-#: ../inc/forum.inc:187 ../inc/forum.inc:195
+#: ../inc/forum.inc:188 ../inc/forum.inc:196
 msgid "%1 message board"
 msgstr "%1 留言板"
 
-#: ../inc/forum.inc:245 ../inc/result.inc:695
+#: ../inc/forum.inc:246 ../inc/result.inc:717
 msgid "Previous"
 msgstr "前"
 
-#: ../inc/forum.inc:283 ../inc/result.inc:704
+#: ../inc/forum.inc:284 ../inc/result.inc:726
 msgid "Next"
 msgstr "后"
 
-#: ../inc/forum.inc:412 ../inc/forum.inc:1175 ../user/forum_forum.php:137
-#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
+#: ../inc/forum.inc:413 ../inc/forum.inc:1218 ../user/forum_forum.php:140
+#: ../user/forum_reply.php:126 ../user/forum_report_post.php:79
 msgid "Author"
 msgstr "作者"
 
-#: ../inc/forum.inc:412 ../inc/pm.inc:86 ../user/forum_edit.php:128
-#: ../user/forum_edit.php:133 ../user/forum_post.php:116
-#: ../user/forum_reply.php:120 ../user/forum_report_post.php:76
-#: ../user/pm.php:90 ../user/pm.php:144
+#: ../inc/forum.inc:413 ../inc/pm.inc:86 ../user/forum_edit.php:128
+#: ../user/forum_edit.php:133 ../user/forum_post.php:120
+#: ../user/forum_reply.php:126 ../user/forum_report_post.php:79
+#: ../user/pm.php:90 ../user/pm.php:149
 msgid "Message"
 msgstr "消息"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send message"
 msgstr "发送 消息"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:583
 msgid "Send %1 a private message"
 msgstr "发送私人消息给 %1"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:584
 msgid "Joined: %1"
 msgstr "已加入:%1"
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:593
 msgid "Posts: %1"
 msgstr "贴子:%1"
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:599
 msgid "Credit: %1"
 msgstr "积分:%1"
 
-#: ../inc/forum.inc:597
+#: ../inc/forum.inc:600
 msgid "RAC: %1"
 msgstr "近期平均积分:%1"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "You haven't read this message yet"
 msgstr "你还没有阅读过该消息"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:624
 msgid "Unread"
 msgstr "未读"
 
-#: ../inc/forum.inc:623 ../inc/forum.inc:628 ../inc/forum.inc:727
+#: ../inc/forum.inc:627 ../inc/forum.inc:632 ../inc/forum.inc:731
 msgid "Message %1"
 msgstr "消息 %1"
 
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:628 ../inc/user.inc:409 ../user/forum_forum.php:178
 msgid "hidden"
 msgstr "隐藏"
 
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:629
 msgid "Posted: %1"
 msgstr "发表于:%1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:632
 msgid " - in response to "
 msgstr " - 回复"
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:635
 msgid "Edit"
 msgstr "编辑"
 
-#: ../inc/forum.inc:631
+#: ../inc/forum.inc:635
 msgid "Edit this message"
 msgstr "编辑该消息"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:641
 msgid "Last modified: %1"
 msgstr "最近的修改日期:%1"
 
-#: ../inc/forum.inc:640
+#: ../inc/forum.inc:644
 msgid ""
 "This post is not shown because the sender is on your 'ignore' list.  Click "
 "%1here%2 to view this post"
 msgstr "该篇帖子未显示是因为其作者在您的忽略列表里。点击%1这里%2来查看"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report this post as offensive"
 msgstr "举报违规帖子"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:672 ../inc/forum.inc:683
 msgid "Report as offensive"
 msgstr "举报违规帖子"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "Rating: %1"
 msgstr "评分:%1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:676
 msgid "rate: "
 msgstr "评分:"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Click if you like this message"
 msgstr "如果你喜欢该消息请点击"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:679
 msgid "Rate +"
 msgstr "加分"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Click if you don't like this message"
 msgstr "如果你不喜欢该消息请点击"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:681
 msgid "Rate -"
 msgstr "减分"
 
-#: ../inc/forum.inc:685 ../user/pm.php:106 ../user/pm.php:146
+#: ../inc/forum.inc:689 ../user/pm.php:111 ../user/pm.php:151
 msgid "Reply"
 msgstr "回复"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:689
 msgid "Post a reply to this message"
 msgstr "回复该消息"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Quote"
 msgstr "引用"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:691
 msgid "Post a reply by quoting this message"
 msgstr "回复并引用该消息"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:712
 msgid "Hidden by a moderator"
 msgstr "被管理员隐藏"
 
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:733
 msgid "Posted %1 by %2"
 msgstr "发表于:%1 作者:%2"
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:751
 msgid "You may not post or rate messages until %1"
 msgstr "你必须等到 %1 后才能回复帖子或给帖子评分"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:762
 msgid ""
 "\n"
 "        <ul>\n"
@@ -372,345 +468,352 @@ msgid ""
 "        <li> No abusive comments involving race, religion,\n"
 "            nationality, gender, class or sexuality.\n"
 "        "
-msgstr "\n        <ul>\n        <li> 帖子内容健康,不包含猥亵的、仇恨的或者与性有关的内容。\n        <li> 禁止商业广告。\n        <li> 禁止链接到与性、赌博等内容有关的网站。\n        <li> 禁止烦扰、敌对其他用户的帖子,禁止破坏主题。\n        <li> 禁止有敌意或侮辱性的帖子。\n        <li> 禁止与种族、宗教、国籍、性别、阶层或性相关的辱骂性评论。\n        "
+msgstr "\n<ul>\n\n<li> 帖子内容健康,不包含猥亵的、仇恨的或者与性有关的内容。\n\n<li> 禁止商业广告。\n\n<li> 禁止链接到与性、赌博等内容有关的网站。\n\n<li> 禁止烦扰、敌对其他用户的帖子,禁止破坏主题。\n\n<li> 禁止有敌意或侮辱性的帖子。\n\n <li> 禁止与种族、宗教、国籍、性别、阶层或性相关的辱骂性评论。\n\n        "
 
-#: ../inc/forum.inc:780
+#: ../inc/forum.inc:784
 msgid "Rules:"
 msgstr "规则:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:785
 msgid "More info"
 msgstr "更多信息"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1082 ../user/forum_thread.php:190
 msgid "Unhide"
 msgstr "取消隐藏"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1082
 msgid "Unhide this post"
 msgstr "取消隐藏帖子"
 
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
+#: ../inc/forum.inc:1084 ../user/forum_thread.php:196
 msgid "Hide"
 msgstr "隐藏"
 
-#: ../inc/forum.inc:1057
+#: ../inc/forum.inc:1084
 msgid "Hide this post"
 msgstr "隐藏帖子"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1089 ../user/forum_thread.php:229
 msgid "Move"
 msgstr "移动"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1089
 msgid "Move post to a different thread"
 msgstr "移动帖子到其它主题"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1094
 msgid "Banish author"
 msgstr "封禁作者"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1101
 msgid "Vote to banish author"
 msgstr "投票封禁作者"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1105
 msgid "Vote not to banish author"
 msgstr "投票不要封禁作者"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1110
 msgid "Start vote to banish author"
 msgstr "开始投票封禁作者"
 
-#: ../inc/forum.inc:1116
+#: ../inc/forum.inc:1115 ../inc/user.inc:312 ../user/forum_thread.php:243
+#: ../user/pm.php:112 ../user/pm.php:152
+msgid "Delete"
+msgstr "删除"
+
+#: ../inc/forum.inc:1115
+msgid "Delete this post"
+msgstr "删除这个帖子"
+
+#: ../inc/forum.inc:1153
 msgid "Only team members can post to the team message board"
 msgstr "只有团队成员才能在团队的留言板中发帖"
 
-#: ../inc/forum.inc:1126
+#: ../inc/forum.inc:1163
 msgid ""
 "In order to create a new thread in %1 you must have a certain amount of "
 "credit. This is to prevent and protect against abuse of the system."
 msgstr "你必须在已经获得了一定的积分后才能在 %1 发表一个新主题。这是为了防止对论坛系统的滥用。"
 
-#: ../inc/forum.inc:1133
+#: ../inc/forum.inc:1170
 msgid ""
 "You cannot create any more threads right now. Please wait a while before "
 "trying again. This delay has been enforced to protect against abuse of the "
 "system."
 msgstr "你暂时不能发表更多的新主题,请稍后再试,这是为了防止对论坛系统的滥用而采取的延时。"
 
-#: ../inc/forum.inc:1140
+#: ../inc/forum.inc:1177
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
 msgstr "该主题已被锁定,只有论坛管理员能够在该主题下发帖。"
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1182
 msgid "Can't post to a hidden thread."
 msgstr "不能回复隐藏主题。"
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1216
 msgid "Thread"
 msgstr "主题"
 
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
-#: ../user/forum_index.php:94
+#: ../inc/forum.inc:1217 ../inc/team.inc:135 ../user/forum_forum.php:139
+#: ../user/forum_index.php:99
 msgid "Posts"
 msgstr "贴数"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1219 ../user/forum_forum.php:141
 msgid "Views"
 msgstr "查看次数"
 
-#: ../inc/forum.inc:1177 ../inc/team.inc:128 ../user/forum_forum.php:139
-#: ../user/forum_help_desk.php:46 ../user/forum_index.php:95
+#: ../inc/forum.inc:1220 ../inc/team.inc:135 ../user/forum_forum.php:142
+#: ../user/forum_help_desk.php:48 ../user/forum_index.php:100
 msgid "Last post"
 msgstr "最近发贴"
 
-#: ../inc/forum.inc:1235
+#: ../inc/forum.inc:1278
 msgid "New posts in the thread %1"
 msgstr "主题 %1 的新回复"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1283
 msgid "New posts in subscribed thread"
 msgstr "已订阅主题的新回复"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1284
 msgid "There are new posts in the thread '%1'"
 msgstr "主题“%1”有新的回帖"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1294
 msgid "Mark all threads as read"
 msgstr "标记所有主题为已读"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1295
 msgid "Mark all threads in all message boards as read."
 msgstr "标记所有留言板块的所有主题为已读。"
 
-#: ../inc/host.inc:24
+#: ../inc/host.inc:25
 msgid "No host"
 msgstr "主机不存在"
 
-#: ../inc/host.inc:26
+#: ../inc/host.inc:27
 msgid "Unavailable"
 msgstr "无法获取"
 
-#: ../inc/host.inc:56 ../inc/prefs.inc:639 ../inc/prefs.inc:1048
+#: ../inc/host.inc:56 ../inc/prefs.inc:665 ../inc/prefs_util.inc:547
 msgid "Home"
 msgstr "家庭"
 
-#: ../inc/host.inc:57 ../inc/prefs.inc:641 ../inc/prefs.inc:1049
-#: ../user/server_status.php:314
+#: ../inc/host.inc:57 ../inc/prefs.inc:666 ../inc/prefs_util.inc:549
+#: ../user/server_status.php:138
 msgid "Work"
 msgstr "工作"
 
-#: ../inc/host.inc:58 ../inc/prefs.inc:640 ../inc/prefs.inc:1050
+#: ../inc/host.inc:58 ../inc/prefs.inc:667 ../inc/prefs_util.inc:548
 msgid "School"
 msgstr "学习"
 
-#: ../inc/host.inc:59
-msgid "Mobile"
-msgstr "手机"
-
-#: ../inc/host.inc:61 ../user/edit_forum_preferences_form.php:172
-#: ../user/edit_forum_preferences_form.php:173
+#: ../inc/host.inc:60 ../user/edit_forum_preferences_form.php:161
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Update"
 msgstr "更新"
 
-#: ../inc/host.inc:85
+#: ../inc/host.inc:84
 msgid "Computer information"
 msgstr "计算机信息"
 
-#: ../inc/host.inc:89 ../inc/host.inc:94
+#: ../inc/host.inc:88 ../inc/host.inc:93
 msgid "IP address"
 msgstr "IP 地址"
 
-#: ../inc/host.inc:89
+#: ../inc/host.inc:88
 msgid "(same the last %1 times)"
 msgstr "(最近 %1 次相同)"
 
-#: ../inc/host.inc:91
+#: ../inc/host.inc:90
 msgid "External IP address"
 msgstr "外部 IP 地址"
 
-#: ../inc/host.inc:94
+#: ../inc/host.inc:93
 msgid "Show IP address"
 msgstr "显示 IP 地址"
 
-#: ../inc/host.inc:96
+#: ../inc/host.inc:95
 msgid "Domain name"
 msgstr "域名"
 
-#: ../inc/host.inc:98
+#: ../inc/host.inc:97
 msgid "Product name"
 msgstr "产品名称"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "Local Standard Time"
 msgstr "当地标准时间"
 
-#: ../inc/host.inc:102
+#: ../inc/host.inc:101
 msgid "UTC %1 hours"
 msgstr "UTC 时间 %1 时"
 
-#: ../inc/host.inc:106 ../inc/host.inc:108 ../inc/host.inc:222
+#: ../inc/host.inc:105 ../inc/host.inc:107 ../inc/host.inc:222
 msgid "Owner"
 msgstr "用户"
 
-#: ../inc/host.inc:108 ../inc/host.inc:355
+#: ../inc/host.inc:107 ../inc/host.inc:360
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../inc/host.inc:112 ../inc/result.inc:630
+#: ../inc/host.inc:111 ../inc/result.inc:634 ../user/apps.php:56
 msgid "Created"
 msgstr "创建时间"
 
-#: ../inc/host.inc:113 ../inc/host.inc:226 ../inc/host.inc:231
-#: ../inc/host.inc:681 ../inc/team.inc:101 ../inc/team.inc:215
-#: ../inc/team.inc:220 ../inc/team.inc:222 ../inc/team.inc:364
-#: ../inc/team.inc:369 ../inc/user.inc:125 ../inc/user.inc:138
-#: ../user/profile_search_action.php:43
-#: ../user/team_change_founder_form.php:78 ../user/team_email_list.php:64
-#: ../user/team_remove_inactive_form.php:41 ../user/top_users.php:54
-#: ../user/top_users.php:59 ../user/user_search.php:140
+#: ../inc/host.inc:112 ../inc/host.inc:226 ../inc/host.inc:231
+#: ../inc/host.inc:686 ../inc/team.inc:105 ../inc/team.inc:224
+#: ../inc/team.inc:229 ../inc/team.inc:231 ../inc/team.inc:373
+#: ../inc/team.inc:378 ../inc/user.inc:126 ../inc/user.inc:139
+#: ../user/profile_search_action.php:45
+#: ../user/team_change_founder_form.php:80 ../user/team_email_list.php:73
+#: ../user/team_remove_inactive_form.php:43 ../user/top_users.php:54
+#: ../user/top_users.php:59 ../user/user_search.php:125
 msgid "Total credit"
 msgstr "总积分"
 
-#: ../inc/host.inc:114 ../inc/user.inc:125 ../user/team_search.php:70
-#: ../user/user_search.php:139
+#: ../inc/host.inc:113 ../inc/user.inc:126 ../user/team_search.php:83
+#: ../user/user_search.php:124
 msgid "Average credit"
 msgstr "平均积分"
 
-#: ../inc/host.inc:116
+#: ../inc/host.inc:115
 msgid "Cross project credit"
 msgstr "跨项目积分"
 
-#: ../inc/host.inc:118
+#: ../inc/host.inc:117
 msgid "CPU type"
 msgstr "CPU 类型"
 
-#: ../inc/host.inc:119
+#: ../inc/host.inc:118
 msgid "Number of processors"
 msgstr "数据器数量"
 
-#: ../inc/host.inc:121
+#: ../inc/host.inc:120
 msgid "Coprocessors"
 msgstr "协处理器"
 
-#: ../inc/host.inc:123 ../inc/host.inc:687
+#: ../inc/host.inc:122 ../inc/host.inc:692
 msgid "Operating System"
 msgstr "操作系统"
 
-#: ../inc/host.inc:126 ../inc/host.inc:235
+#: ../inc/host.inc:125 ../inc/host.inc:235
 msgid "BOINC version"
 msgstr "BOINC 版本"
 
-#: ../inc/host.inc:130
+#: ../inc/host.inc:129 ../inc/prefs.inc:237
 msgid "Memory"
 msgstr "内存"
 
-#: ../inc/host.inc:130 ../inc/host.inc:140
+#: ../inc/host.inc:129 ../inc/host.inc:139
 msgid "%1 MB"
 msgstr "%1 MB"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "Cache"
 msgstr "缓存"
 
-#: ../inc/host.inc:134
+#: ../inc/host.inc:133
 msgid "%1 KB"
 msgstr "%1 KB"
 
-#: ../inc/host.inc:140
+#: ../inc/host.inc:139
 msgid "Swap space"
 msgstr "交换空间"
 
-#: ../inc/host.inc:143
+#: ../inc/host.inc:142
 msgid "Total disk space"
 msgstr "总磁盘空间"
 
-#: ../inc/host.inc:143 ../inc/host.inc:146
+#: ../inc/host.inc:142 ../inc/host.inc:145
 msgid "%1 GB"
 msgstr "%1 GB"
 
-#: ../inc/host.inc:146
+#: ../inc/host.inc:145
 msgid "Free Disk Space"
 msgstr "空闲磁盘空间"
 
-#: ../inc/host.inc:150
+#: ../inc/host.inc:149
 msgid "Measured floating point speed"
 msgstr "浮点运算速度"
 
-#: ../inc/host.inc:150 ../inc/host.inc:153
+#: ../inc/host.inc:149 ../inc/host.inc:152
 msgid "%1 million ops/sec"
 msgstr "每秒 %1 百万次运算"
 
-#: ../inc/host.inc:153
+#: ../inc/host.inc:152
 msgid "Measured integer speed"
 msgstr "整数运算速度"
 
-#: ../inc/host.inc:157 ../inc/host.inc:159
+#: ../inc/host.inc:156 ../inc/host.inc:158
 msgid "Average upload rate"
 msgstr "平均上传速度"
 
-#: ../inc/host.inc:157 ../inc/host.inc:164
+#: ../inc/host.inc:156 ../inc/host.inc:163
 msgid "%1 KB/sec"
 msgstr "%1 KB/秒"
 
-#: ../inc/host.inc:159 ../inc/host.inc:166 ../inc/result.inc:216
+#: ../inc/host.inc:158 ../inc/host.inc:165 ../inc/result.inc:216
 #: ../inc/result.inc:226 ../inc/result.inc:244 ../inc/result.inc:262
 #: ../inc/result.inc:278 ../user/explain_state.php:56
 #: ../user/host_app_versions.php:30
 msgid "Unknown"
 msgstr "未知"
 
-#: ../inc/host.inc:164 ../inc/host.inc:166
+#: ../inc/host.inc:163 ../inc/host.inc:165
 msgid "Average download rate"
 msgstr "平均下载速度"
 
-#: ../inc/host.inc:169 ../user/host_app_versions.php:65
+#: ../inc/host.inc:168 ../user/host_app_versions.php:65
 msgid "Average turnaround time"
 msgstr "平均任务周转时间"
 
-#: ../inc/host.inc:169 ../user/forum_search.php:46 ../user/forum_search.php:47
-#: ../user/forum_search.php:48 ../user/forum_search.php:49
+#: ../inc/host.inc:168 ../user/forum_search.php:48 ../user/forum_search.php:49
+#: ../user/forum_search.php:50 ../user/forum_search.php:51
 msgid "%1 days"
 msgstr "%1 天"
 
-#: ../inc/host.inc:170
+#: ../inc/host.inc:169
 msgid "Application details"
 msgstr "计算程序"
 
-#: ../inc/host.inc:171
+#: ../inc/host.inc:170
 msgid "Show"
 msgstr "查看"
 
-#: ../inc/host.inc:181 ../inc/host.inc:336 ../inc/user.inc:152
+#: ../inc/host.inc:180 ../inc/host.inc:341 ../inc/user.inc:155
 msgid "Tasks"
 msgstr "任务"
 
-#: ../inc/host.inc:185 ../inc/host.inc:206
+#: ../inc/host.inc:184 ../inc/host.inc:206
 msgid "Number of times client has contacted server"
 msgstr "客户端连接服务端的次数"
 
-#: ../inc/host.inc:186
+#: ../inc/host.inc:185
 msgid "Last time contacted server"
 msgstr "最近一次连接服务端的时间"
 
-#: ../inc/host.inc:187
-#, php-format
-msgid "% of time BOINC is running"
-msgstr "BOINC 客户端运行的时间比例"
+#: ../inc/host.inc:186
+msgid "Fraction of time BOINC is running"
+msgstr "BOINC运行的时间"
 
-#: ../inc/host.inc:189
-#, php-format
-msgid "While BOINC running, % of time host has an Internet connection"
-msgstr "当 BOINC 在运行时,主机拥有互联网连接的时间比例"
+#: ../inc/host.inc:188
+msgid ""
+"While BOINC is running, fraction of time computer has an Internet connection"
+msgstr "BOINC在运行时,计算机有互联网连接的时间"
+
+#: ../inc/host.inc:190
+msgid "While BOINC is running, fraction of time computing is allowed"
+msgstr "BOINC在运行时,允许计算的时间"
 
 #: ../inc/host.inc:191
-#, php-format
-msgid "While BOINC running, % of time work is allowed"
-msgstr "当 BOINC 在运行时,允许计算的时间比例"
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "BOINC在运行时,允许GPU计算的时间"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -720,7 +823,7 @@ msgstr "平均的 CPU 运行效率"
 msgid "Task duration correction factor"
 msgstr "任务时长校正因子"
 
-#: ../inc/host.inc:198 ../inc/host.inc:674
+#: ../inc/host.inc:198 ../inc/host.inc:679
 msgid "Location"
 msgstr "位置"
 
@@ -736,7 +839,7 @@ msgstr "合并该计算机的冗余记录"
 msgid "Merge"
 msgstr "合并"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
 msgstr "最近一次通讯"
 
@@ -744,30 +847,30 @@ msgstr "最近一次通讯"
 msgid "Computer info"
 msgstr "计算机信息"
 
-#: ../inc/host.inc:221 ../inc/host.inc:676 ../inc/team.inc:357
+#: ../inc/host.inc:221 ../inc/host.inc:681 ../inc/team.inc:366
 #: ../user/top_users.php:48
 msgid "Rank"
 msgstr "名次"
 
-#: ../inc/host.inc:225 ../inc/host.inc:679
+#: ../inc/host.inc:225 ../inc/host.inc:684
 msgid "Avg. credit"
 msgstr "平均积分"
 
-#: ../inc/host.inc:230 ../inc/team.inc:102 ../inc/team.inc:216
-#: ../inc/team.inc:225 ../inc/team.inc:227 ../inc/team.inc:363
-#: ../inc/team.inc:368 ../inc/user.inc:139
-#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:64
-#: ../user/team_remove_inactive_form.php:42 ../user/top_users.php:53
+#: ../inc/host.inc:230 ../inc/team.inc:106 ../inc/team.inc:225
+#: ../inc/team.inc:234 ../inc/team.inc:236 ../inc/team.inc:372
+#: ../inc/team.inc:377 ../inc/user.inc:140
+#: ../user/team_change_founder_form.php:81 ../user/team_email_list.php:73
+#: ../user/team_remove_inactive_form.php:44 ../user/top_users.php:53
 #: ../user/top_users.php:58
 msgid "Recent average credit"
 msgstr "近期平均积分"
 
-#: ../inc/host.inc:236 ../inc/host.inc:684 ../inc/result.inc:51
+#: ../inc/host.inc:236 ../inc/host.inc:689 ../inc/result.inc:51
 #: ../user/host_app_versions.php:25
 msgid "CPU"
 msgstr "CPU"
 
-#: ../inc/host.inc:237 ../inc/host.inc:685
+#: ../inc/host.inc:237 ../inc/host.inc:690
 msgid "GPU"
 msgstr "GPU"
 
@@ -775,91 +878,83 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "操作系统"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
 msgstr "(%1 处理器)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "详细"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
 msgstr "跨项目的统计信息:"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
 msgstr "主机 %1 的活跃期有重叠:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr "主机 %1 的操作系统不兼容:"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr "主机 %1 的 CPU 类型不兼容:"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
 msgstr "相同的主机"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
 msgstr "无法将主机 %1 合并至 主机 %2 - 主机不兼容"
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr "正在将主机 %1 合并至主机 %2"
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
 msgstr "无法更新新计算机的积分"
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
 msgstr "无法更新任务拷贝"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
 msgstr "无法撤销旧的计算机"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
 msgstr "旧的计算机 %1 已撤销"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "显示:"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
 msgstr "所有计算机"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Only computers active in past 30 days"
 msgstr "仅显示最近 30 天内活跃的计算机"
 
-#: ../inc/host.inc:666 ../inc/result.inc:637
+#: ../inc/host.inc:671 ../inc/result.inc:642
 msgid "Computer ID"
 msgstr "计算机 ID"
 
-#: ../inc/host.inc:669 ../inc/result.inc:628 ../inc/team.inc:210
-#: ../inc/team.inc:358 ../inc/user.inc:199 ../user/account_finish.php:41
-#: ../user/create_account_form.php:79 ../user/team_admins.php:62
-#: ../user/team_change_founder_form.php:77 ../user/team_email_list.php:64
-#: ../user/top_users.php:49 ../user/user_search.php:139
-msgid "Name"
-msgstr "用户名"
-
-#: ../inc/host.inc:682
+#: ../inc/host.inc:687
 msgid "BOINC<br>version"
 msgstr "BOINC<br>版本"
 
-#: ../inc/host.inc:745 ../user/merge_by_name.php:65
+#: ../inc/host.inc:750 ../user/merge_by_name.php:65
 msgid "Merge computers by name"
 msgstr "通过名称合并计算机"
 
-#: ../inc/language_names.inc:61
+#: ../inc/language_names.inc:62
 msgid "Browser default"
 msgstr "浏览器缺省"
 
@@ -872,29 +967,29 @@ msgstr "评论"
 msgid "News is available as an %sRSS feed%s"
 msgstr "新闻还可以通过 %sRSS%s 来获取"
 
-#: ../inc/pm.inc:25 ../inc/pm.inc:174 ../user/pm.php:69 ../user/pm.php:148
+#: ../inc/pm.inc:25 ../inc/pm.inc:176 ../user/pm.php:69 ../user/pm.php:153
 msgid "Inbox"
 msgstr "收件箱"
 
-#: ../inc/pm.inc:26 ../inc/pm.inc:178
+#: ../inc/pm.inc:26 ../inc/pm.inc:180
 msgid "Write"
 msgstr "写信"
 
-#: ../inc/pm.inc:33 ../inc/user.inc:378
+#: ../inc/pm.inc:33 ../inc/user.inc:458
 msgid "Send private message"
 msgstr "发送私人消息"
 
 #: ../inc/pm.inc:35 ../inc/pm.inc:37 ../inc/pm.inc:89
 #: ../user/ffmail_form.php:58 ../user/forum_edit.php:99
 #: ../user/forum_edit.php:101 ../user/forum_edit.php:145
-#: ../user/forum_post.php:61 ../user/forum_post.php:87
-#: ../user/forum_post.php:89 ../user/forum_post.php:130
-#: ../user/forum_reply.php:74 ../user/forum_reply.php:107
-#: ../user/forum_reply.php:109 ../user/forum_reply.php:165 ../user/pm.php:181
+#: ../user/forum_post.php:65 ../user/forum_post.php:91
+#: ../user/forum_post.php:93 ../user/forum_post.php:134
+#: ../user/forum_reply.php:77 ../user/forum_reply.php:110
+#: ../user/forum_reply.php:115 ../user/forum_reply.php:171 ../user/pm.php:186
 msgid "Preview"
 msgstr "预览"
 
-#: ../inc/pm.inc:48 ../user/pm.php:131
+#: ../inc/pm.inc:48 ../user/pm.php:136
 msgid "no such message"
 msgstr "消息不存在"
 
@@ -906,7 +1001,7 @@ msgstr "收件人"
 msgid "User IDs or unique usernames, separated with commas"
 msgstr "用户ID或唯一的用户名,多个收件人之间用逗号分开"
 
-#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:139
+#: ../inc/pm.inc:85 ../user/pm.php:90 ../user/pm.php:144
 msgid "Subject"
 msgstr "标题"
 
@@ -914,376 +1009,499 @@ msgstr "标题"
 msgid "Send message"
 msgstr "发送消息"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
 msgstr "给你发送了一条私人消息,标题是:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
 msgstr "私人消息 %1 来自 %2,标题是:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
 msgstr "无法创建消息"
 
-#: ../inc/pm.inc:166
+#: ../inc/pm.inc:168
 msgid ""
 "You are not allowed to send privates messages so often. Please wait some "
 "time before sending more messages."
 msgstr "你发送消息的间隔时间太短,请等待一段时间再发送更多的消息。"
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "未读"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
 msgstr "如需要电子邮件通知,请%1编辑社区参数设置%2。"
 
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "私人消息"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "使用率限制"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "最多使用"
+
+#: ../inc/prefs.inc:49
+#, no-php-format
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr "当计算机通过电池供电时暂停计算?%1只有便携计算机需要使用该设置%2"
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
+msgstr "保留一些CPU核心以供其他应用程序使用。例如: 75%意味着在8核CPU上使用6个核心。"
 
-#: ../inc/prefs.inc:85
-msgid "Suspend work while computer is in use?"
-msgstr "在你使用计算机时暂停计算?"
+#: ../inc/prefs.inc:52
+#, no-php-format
+msgid "% of the CPUs"
+msgstr "% o的CPU"
 
-#: ../inc/prefs.inc:91
+#: ../inc/prefs.inc:57
+#, no-php-format
 msgid ""
-"Suspend GPU work while computer is in use? %1 Enforced by version 6.6.21+ %2"
-msgstr "当计算机在使用的时候暂停 GPU 计算?%16.6.21 之后的版本实现了该设置%2"
+"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 "每隔几秒钟就暂停一下然后恢复计算,以降低CPU温度并减少电能使用。比如:75%意味着每计算 3 秒就暂停 1 秒,然后如此重复。"
 
-#: ../inc/prefs.inc:99
-msgid "'In use' means mouse/keyboard activity in last"
-msgstr "如果在最近的多少时间内有鼠标或键盘操作则认为计算机在使用中"
+#: ../inc/prefs.inc:60
+#, no-php-format
+msgid "% of CPU time"
+msgstr "% 的处理器时间"
 
-#: ../inc/prefs.inc:101 ../inc/prefs.inc:110 ../inc/prefs.inc:144
-msgid "minutes"
-msgstr "分钟"
+#: ../inc/prefs.inc:62 ../inc/prefs.inc:208
+msgid "When to suspend"
+msgstr "以下情况暂停计算"
 
-#: ../inc/prefs.inc:105
-msgid ""
-"Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-"
-"power mode on some computers %2"
-msgstr "如果在最近的多少时间内没有鼠标或键盘操作则暂停计算%1在某些计算上如果要进入低能耗模式必须设置%2"
+#: ../inc/prefs.inc:64
+msgid "Suspend when computer is on battery"
+msgstr "当计算机正在使用电池供电时暂停计算"
 
-#: ../inc/prefs.inc:114
+#: ../inc/prefs.inc:65
 msgid ""
-"Suspend work when non-BOINC CPU usage is above %1 0 means no "
-"restriction<br>Enforced by version 6.10.30+ %2"
-msgstr "如果非 BOINC 的 CPU 占用率高于指定值则暂停计算%10 表示不限制<br>6.10.30 之后的版本实现了该设置%2"
+"Check this to suspend computing on portables when running on battery power."
+msgstr "勾选这个选项以使得笔记本电脑在靠电池电源运行时暂停计算。"
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr "计算时间段%1如果相同则表示不限制%2"
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "当计算机正在使用时暂停计算"
 
-#: ../inc/prefs.inc:130
+#: ../inc/prefs.inc:71
 msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr "暂停计算时将任务驻留在内存?%1选择是的话,暂停的内存将占用交换空间%2"
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "勾选这个选项以使得当您使用计算机时暂停计算和文件传输。"
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "计算任务的切换时间间隔%1推荐设置:60 分钟%2"
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "当使用计算机时暂停 GPU 计算"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "在多处理器计算机上,最多使用"
+#: ../inc/prefs.inc:77
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "勾选这个选项以使得当您使用计算机时暂停GPU计算。"
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "处理器"
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "如果在最近的多少分钟内有鼠标或键盘操作则认为计算机在使用中"
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr "在多处理器计算机上,最多使用%16.1 之后的版本实现了该设置%2"
+#: ../inc/prefs.inc:83
+msgid "This determines when the computer is considered 'in use'."
+msgstr "这将确定在怎样的情况下计算机会被视为“正在使用”。"
 
-#: ../inc/prefs.inc:158
-#, php-format
-msgid "% of the processors"
-msgstr "% 的处理器"
+#: ../inc/prefs.inc:85 ../inc/prefs.inc:92 ../inc/prefs.inc:122
+msgid "minutes"
+msgstr "分钟"
 
-#: ../inc/prefs.inc:162
-msgid "Use at most %1 Can be used to reduce CPU heat %2"
-msgstr "最多使用%1可用于减少 CPU  的发热量%2"
+#: ../inc/prefs.inc:89
+msgid "Suspend when no mouse/keyboard input in last"
+msgstr "如果在最近的多少分钟内无鼠标或键盘操作则暂停计算"
 
-#: ../inc/prefs.inc:167
-#, php-format
-msgid "% of CPU time"
-msgstr "% 的处理器时间"
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "这将使得一些计算机在不使用时进入低功耗模式。"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "磁盘:最多使用"
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "当非BOINC CPU使用率高于多少时暂停"
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "GB"
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "当您的计算机正忙于运行其他程序时暂停计算。"
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr "磁盘:至少保留%1小于 %2 的设定值将被忽略%3"
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "仅在如下时间段内计算。"
 
-#: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
-#: ../inc/prefs.inc:211
-#, php-format
-msgid "% of total"
-msgstr "%"
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "仅在每天的特定时间段内计算。"
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "计算任务最小的存盘时间间隔"
+#: ../inc/prefs.inc:105 ../inc/prefs.inc:214
+#: ../user/forum_banishment_vote.php:70
+#: ../user/forum_banishment_vote_action.php:65
+#: ../user/forum_moderate_post.php:63 ../user/forum_moderate_thread.php:61
+msgid "Other"
+msgstr "其它"
 
-#: ../inc/prefs.inc:196
-msgid "seconds"
-msgstr "秒"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "至少存储"
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "交换空间:最多使用"
+#: ../inc/prefs.inc:108
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "存储至少足够使计算机计算如此长时间的任务。"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "内存:如果计算机在使用中,最多使用"
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "天的工作"
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "内存:如果计算机未在使用,最多使用"
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "额外存储"
 
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr "缓存足够的任务以保证至少能用来计算 %1(最多 10 天)。%2"
+#: ../inc/prefs.inc:114
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "在最低限度之上额外存储一些任务。这将决定BOINC客户端在联系一个项目时要求多少新任务。"
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr "天"
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+msgstr "每隔多少分钟切换任务"
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "... 并且还可以额外地计算"
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "如果您同时运行几个项目,BOINC 将每隔这么长时间切换一次任务。"
 
-#: ../inc/prefs.inc:232
-msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr "连接至互联网前要求用户确认?%1仅 Modem、ISDN 和 VPN 用户需要使用该设置%2"
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "要求任务每隔多少分钟储存一次进度"
 
-#: ../inc/prefs.inc:241
+#: ../inc/prefs.inc:126
 msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr "传输完成时断开网络?%1仅 Modem、ISDN 和 VPN 用户需要使用该设置%2 "
-
-#: ../inc/prefs.inc:249
-msgid "Maximum download rate:"
-msgstr "最大下载速率:"
+"This controls how often tasks save their state to disk, so that they can be "
+"restarted later."
+msgstr "这个选项决定计算任务向磁盘保存其进度的频繁程度,以便于之后重新启动。"
 
-#: ../inc/prefs.inc:251 ../inc/prefs.inc:256
-msgid "Kbytes/sec"
-msgstr "千字节/秒"
+#: ../inc/prefs.inc:128
+msgid "seconds"
+msgstr "秒"
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "最大上传速率:"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "最多使用"
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr "允许使用网络的时间段"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "限制BOINC使用的磁盘空间总量。"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "最多传输%16.10.46 之后的版本实现了该设置%2"
+#: ../inc/prefs.inc:139
+msgid "GB"
+msgstr "GB"
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "MB / 每"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "至少保留"
 
-#: ../inc/prefs.inc:274
+#: ../inc/prefs.inc:143
 msgid ""
-"Skip image file verification? %1 Check this ONLY if your Internet provider "
-"modifies image files (UMTS does this, for example). %2 Skipping verification"
-" reduces the security of BOINC. %3"
-msgstr "跳过映像文件验证?%1仅在你的 ISP 会修改映像文件的情况下(比如 UMTS 就会这样)需要选中这个。%2跳过验证会影响 BOINC 的安全性。%3"
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "限制BOINC的磁盘使用,在BOINC存储数据的卷上保留这个数量的空闲空间。"
 
-#: ../inc/prefs.inc:287
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB可用空间"
+
+#: ../inc/prefs.inc:149
 msgid ""
-"Resource share %1 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. %2"
-msgstr "资源分享%1该设置决定你的计算机分配给本项目的资源比例。举例:你参加了两个项目,其资源分享率分别是 100 和 200,则第一个项目将得到 1/3 的计算资源,第二个项目将得到 2/3。%2"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "限制BOINC在存储数据的卷上使用的磁盘空间的百分比。"
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr "给每个 GPU 任务保留一个 CPU 内核?"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "%"
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "使用 CPU%16.10 之后的版本实现了该设置%2"
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "当计算机在使用时,最多使用"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "使用 ATI GPU%16.10 之后的版本实现了该设置%2"
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "当您使用计算机时,限制BOINC的内存使用量。"
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "使用 NVIDIA GPU%16.10 之后的版本实现了该设置%2"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "使用 %17.2 及后续版本%2支持的 Intel GPU"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "当计算机空闲时,最多使用"
 
-#: ../inc/prefs.inc:358
-msgid ""
-"Run test applications? %1 This helps us develop applications, but may cause "
-"jobs to fail on your computer %2"
-msgstr "运行测试用途的计算程序?%1这可以帮助我们开发计算程序,但可能会导致你计算机上的计算任务运行失败%2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "当您不使用计算机时,限制BOINC的内存使用量。"
 
-#: ../inc/prefs.inc:367
+#: ../inc/prefs.inc:172
+msgid "Leave non-GPU tasks in memory while suspended"
+msgstr "在暂停时将非GPU任务留在内存中"
+
+#: ../inc/prefs.inc:173
 msgid ""
-"Emails will be sent from %1; make sure your spam filter accepts this "
-"address."
-msgstr "电子邮件将从 %1 发送,请确保你的垃圾邮件过滤器不会过滤这个地址。"
+"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 "如果选中此选项,暂停的任务将会留在内存中,恢复时不会有进度损失。如果未选中,暂停的任务将从内存中被清除,继续计算时从最后一个保存点开始。"
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "是否允许 %1 和你所在的计算团队发送电子邮件给你?"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "虚拟内存:最多使用"
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "%1 是否可以将你的计算机显示在它的网站上?"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "限制 BOINC 使用的交换空间 (页面文件)大小。"
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "磁盘和内存使用"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "限制下载速度为"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "处理器使用"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "限制文件传输的下载速率。"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "网络使用"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "KB/秒"
 
-#: ../inc/prefs.inc:392
-msgid ""
-"These preferences apply to all the BOINC projects in which you participate."
-msgstr "这些参数设置对你参加的所有 BOINC 项目均有效。"
+#: ../inc/prefs.inc:195
+msgid "Limit upload rate to"
+msgstr "限制上传速率为"
 
-#: ../inc/prefs.inc:395
-msgid ""
-"%1Unable to update preferences.%2 The values marked in red below were out of"
-" range or not numeric."
-msgstr "%1无法更新参数设置。%2下面标红的为超出范围的或类型错误的数值。"
+#: ../inc/prefs.inc:196
+msgid "Limit the upload rate of file transfers."
+msgstr "限制文件传输的上传速率。"
 
-#: ../inc/prefs.inc:445
-msgid "bad venue: %1"
-msgstr "错误的参数设置位置:%1"
+#: ../inc/prefs.inc:201
+msgid "Limit usage to"
+msgstr "限制使用量为"
 
-#: ../inc/prefs.inc:451
-msgid "bad subset: %1"
-msgstr "错误的参数设置子集:%1"
+#: ../inc/prefs.inc:202
+msgid "Example: BOINC should transfer at most 2000 MB of data every 30 days."
+msgstr "例如: 限制BOINC在30天内最多传输2000 MB数据。"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1025
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:85
-msgid "yes"
-msgstr "是"
+#: ../inc/prefs.inc:205
+msgid "MB every"
+msgstr "MB 每"
 
-#: ../inc/prefs.inc:671 ../inc/prefs.inc:674 ../inc/prefs.inc:1027
-#: ../inc/prefs_util.inc:93 ../project.sample/project_specific_prefs.inc:87
-msgid "no"
-msgstr "否"
+#: ../inc/prefs.inc:206 ../inc/util.inc:303
+msgid "days"
+msgstr "天"
 
-#: ../inc/prefs.inc:679 ../user/forum_search.php:53
-msgid "no limit"
-msgstr "不限制"
+#: ../inc/prefs.inc:210
+msgid "Transfer files only between"
+msgstr "允许传输文件的时间段:"
 
-#: ../inc/prefs.inc:704 ../user/team_admins.php:79
-msgid "Add"
-msgstr "增加"
+#: ../inc/prefs.inc:211
+msgid "Transfer files only during a particular period each day."
+msgstr "仅在每天的特定时间段内传输文件。"
 
-#: ../inc/prefs.inc:706 ../inc/prefs.inc:834
-#: ../user/edit_forum_preferences_form.php:160 ../user/team_admins.php:34
-msgid "Remove"
-msgstr "移除"
+#: ../inc/prefs.inc:216
+msgid "Skip data verification for image files"
+msgstr "跳过图片文件的数据校验"
+
+#: ../inc/prefs.inc:217
+msgid ""
+"Check this only if your Internet provider modifies image files. Skipping "
+"verification reduces the security of BOINC."
+msgstr "仅当您的Internet提供商会修改图像文件的情况下才需要选中此选项。跳过验证会降低BOINC的安全性。"
+
+#: ../inc/prefs.inc:222
+msgid "Confirm before connecting to Internet"
+msgstr "连接到互联网之前确认"
+
+#: ../inc/prefs.inc:223 ../inc/prefs.inc:229
+msgid "Useful only if you have a modem, ISDN or VPN connection."
+msgstr "仅当您使用调制解调器、ISDN或VPN连接的情况下才有用。"
 
-#: ../inc/prefs.inc:812 ../user/explain_state.php:94
+#: ../inc/prefs.inc:228
+msgid "Disconnect when done"
+msgstr "传输完成后断开连接"
+
+#: ../inc/prefs.inc:235 ../inc/prefs.inc:472 ../user/explain_state.php:94
 msgid "Computing"
 msgstr "计算"
 
-#: ../inc/prefs.inc:823
+#: ../inc/prefs.inc:236
+msgid "Disk"
+msgstr "磁盘"
+
+#: ../inc/prefs.inc:238
+msgid "Network"
+msgstr "网络"
+
+#: ../inc/prefs.inc:241
+msgid ""
+"These preferences apply to all the BOINC projects in which you participate."
+msgstr "这些参数设置对你参加的所有 BOINC 项目均有效。"
+
+#: ../inc/prefs.inc:244
+msgid ""
+"%1Unable to update preferences.%2 The values marked in red below were out of"
+" range or not numeric."
+msgstr "%1无法更新参数设置。%2下面标红的为超出范围的或类型错误的数值。"
+
+#: ../inc/prefs.inc:483
 msgid "Separate preferences for %1"
 msgstr "用于%1环境的参数设置"
 
-#: ../inc/prefs.inc:833 ../inc/prefs.inc:914
+#: ../inc/prefs.inc:493 ../inc/prefs.inc:528 ../inc/prefs_project.inc:291
 msgid "Edit preferences"
 msgstr "编辑参数设置"
 
-#: ../inc/prefs.inc:839
+#: ../inc/prefs.inc:494 ../user/edit_forum_preferences_form.php:149
+#: ../user/team_admins.php:36
+msgid "Remove"
+msgstr "移除"
+
+#: ../inc/prefs.inc:499
 msgid "Add separate preferences for %1"
 msgstr "增加%1环境的参数设置"
 
-#: ../inc/prefs.inc:847 ../inc/prefs.inc:895
-msgid "(Switch View)"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "这些设置适用于所有使用此帐户的计算机,除非"
+
+#: ../inc/prefs.inc:508
+msgid ""
+"computers where you have set preferences locally using the BOINC Manager"
+msgstr "计算机设置了本地BOINC管理器的首选项"
+
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Android 设备"
+
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
 msgstr "(切换视图)"
 
-#: ../inc/prefs.inc:849 ../inc/prefs.inc:898
+#: ../inc/prefs.inc:515 ../inc/prefs_project.inc:272
 msgid "Combined preferences"
 msgstr "横排的参数设置"
 
-#: ../inc/prefs.inc:854
-msgid "Project specific settings"
-msgstr "项目特定的参数设置"
-
-#: ../inc/prefs.inc:862 ../inc/prefs.inc:907
+#: ../inc/prefs.inc:522 ../inc/prefs_project.inc:283
 msgid "Primary (default) preferences"
 msgstr "默认的参数设置"
 
-#: ../inc/prefs.inc:871 ../user/add_venue.php:39 ../user/add_venue.php:63
-#: ../user/prefs_edit.php:40 ../user/prefs_edit.php:64
-#: ../user/prefs_edit.php:92
-msgid "Edit %1 preferences"
-msgstr "编辑 %1 的参数设置"
+#: ../inc/prefs.inc:537
+msgid "Preferences last modified:"
+msgstr "最近的修改日期:"
 
-#: ../inc/prefs.inc:885
-msgid "These apply to all BOINC projects in which you participate."
-msgstr "这些参数设置对你参加的所有 BOINC 项目均有效。"
+#: ../inc/prefs.inc:553
+msgid "Add preferences"
+msgstr "增加参数设置"
+
+#: ../inc/prefs.inc:557
+msgid "Update preferences"
+msgstr "更新参数设置"
+
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "是"
 
-#: ../inc/prefs.inc:887
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
+msgstr "否"
+
+#: ../inc/prefs.inc:638
+msgid "Default computer location"
+msgstr "默认的计算机位置"
+
+#: ../inc/prefs.inc:639
 msgid ""
-"On computers participating in multiple projects, the most recently modified "
-"preferences will be used."
-msgstr "在参与到多个项目的计算机上,使用的是最近修改的参数设置。"
+"New computers will use this location for computing and project preferences."
+msgstr "新的计算机将使用此位置作为计算和项目的首选项。"
 
-#: ../inc/prefs.inc:889
-msgid "These preferences do not apply to Android devices."
-msgstr "这些参数设置不适用于安卓设备。"
+#: ../inc/prefs_project.inc:52
+msgid "Resource share"
+msgstr "资源分享"
 
-#: ../inc/prefs.inc:892
-msgid "Preferences last modified:"
-msgstr "最近的修改日期:"
+#: ../inc/prefs_project.inc:53
+msgid ""
+"Determines the proportion of your computer's resources allocated to this "
+"project. For 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 "该设置决定你的计算机分配给本项目的资源比例。举例:你参加了两个项目,其资源分享率分别是 100 和 200,则第一个项目将得到 1/3 的计算资源,第二个项目将得到 2/3。"
 
-#: ../inc/prefs.inc:944
-msgid "Add preferences"
-msgstr "增加参数设置"
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "给每个 GPU 任务保留一个 CPU 内核?"
+
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "使用CPU"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "使用ATI GPU"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "使用NVIDIA GPU"
+
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "使用Intel GPU"
+
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "运行测试应用程序吗?"
+
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "这有助于我们开发应用程序,但可能会导致任务在您的计算机上运行失败"
+
+#: ../inc/prefs_project.inc:115
+msgid ""
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "电子邮件将从 %1 发送,请确保你的垃圾邮件过滤器不会过滤这个地址。"
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "是否允许 %1 和你所在的计算团队发送电子邮件给你?"
+
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "%1 是否可以将你的计算机显示在它的网站上?"
+
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(切换视图)"
+
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "项目特定的参数设置"
 
-#: ../inc/prefs.inc:948
-msgid "Update preferences"
-msgstr "更新参数设置"
+#: ../inc/prefs_util.inc:33
+msgid "bad venue: %1"
+msgstr "错误的参数设置位置:%1"
 
-#: ../inc/prefs.inc:1036 ../inc/prefs.inc:1045
-msgid "Default computer location"
-msgstr "默认的计算机位置"
+#: ../inc/prefs_util.inc:39
+msgid "bad subset: %1"
+msgstr "错误的参数设置子集:%1"
 
-#: ../inc/prefs_util.inc:305 ../inc/prefs_util.inc:315
+#: ../inc/prefs_util.inc:476 ../inc/prefs_util.inc:500
 msgid "and"
 msgstr "和"
 
@@ -1299,7 +1517,7 @@ msgid ""
 "people. Please change it."
 msgstr "你的用户档案已被标识为不可接受,其他用户也将无法查看,请进行适当的修改。"
 
-#: ../inc/profile.inc:172 ../user/friend.php:105 ../user/friend.php:172
+#: ../inc/profile.inc:172 ../user/friend.php:107 ../user/friend.php:174
 msgid "Database error"
 msgstr "数据库错误"
 
@@ -1317,7 +1535,7 @@ msgstr "用户已被禁言"
 msgid "No profile exists for that user ID."
 msgstr "没有和该用户 ID 对应的用户档案信息。"
 
-#: ../inc/profile.inc:219 ../user/create_profile.php:313
+#: ../inc/profile.inc:219 ../user/create_profile.php:309
 msgid "Edit your profile"
 msgstr "编辑你的用户档案"
 
@@ -1365,11 +1583,12 @@ msgstr "数据库中不存在"
 msgid "pending"
 msgstr "等待中"
 
-#: ../inc/result.inc:114 ../user/forum_search.php:60
+#: ../inc/result.inc:114 ../user/forum_search.php:62
 msgid "All"
 msgstr "所有"
 
 #: ../inc/result.inc:115 ../inc/result.inc:176 ../inc/result.inc:223
+#: ../user/server_status.php:163
 msgid "In progress"
 msgstr "计算中"
 
@@ -1398,6 +1617,7 @@ msgid "Inactive"
 msgstr "不活跃的"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:163
 msgid "Unsent"
 msgstr "未发送的"
 
@@ -1562,127 +1782,135 @@ msgid "WU cancelled"
 msgstr "WU 已被取消"
 
 #: ../inc/result.inc:322
+msgid "Canonical result is missing"
+msgstr "规范结果缺失"
+
+#: ../inc/result.inc:326
 msgid "Unrecognized Error: %1"
 msgstr "无法识别的错误:%1"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Task name"
 msgstr "任务名称"
 
-#: ../inc/result.inc:349 ../inc/result.inc:354 ../inc/result.inc:357
-#: ../inc/result.inc:360
+#: ../inc/result.inc:353 ../inc/result.inc:358 ../inc/result.inc:361
+#: ../inc/result.inc:364
 msgid "click for details"
 msgstr "点击查看详细"
 
-#: ../inc/result.inc:349
+#: ../inc/result.inc:353
 msgid "Show IDs"
 msgstr "显示 ID"
 
-#: ../inc/result.inc:354
+#: ../inc/result.inc:358
 msgid "Show names"
 msgstr "显示名称"
 
-#: ../inc/result.inc:357
+#: ../inc/result.inc:361
 msgid "Task"
 msgstr "任务"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
 msgstr "任务单元"
 
-#: ../inc/result.inc:369
+#: ../inc/result.inc:373
 msgid "Computer"
 msgstr "计算机"
 
-#: ../inc/result.inc:372 ../inc/result.inc:631
+#: ../inc/result.inc:376 ../inc/result.inc:635
 msgid "Sent"
 msgstr "发送时间"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
 msgstr "结果上报时间<br />或者上报期限"
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
 msgstr "解释"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
 msgstr "状态"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
 msgstr "运行时间<br />(秒)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr "CPU 时间<br />(秒)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
 msgstr "积分"
 
-#: ../inc/result.inc:380 ../inc/result.inc:724
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:163
 msgid "Application"
 msgstr "计算程序"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
 msgstr "任务单元"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "上报期限"
+
+#: ../inc/result.inc:637
 msgid "Received"
 msgstr "接收时间"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
 msgstr "服务端状态"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
 msgstr "结果"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
 msgstr "客户端状态"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
 msgstr "退出状态"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "上报期限"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
 msgstr "运行时间"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
 msgstr "CPU 时间"
 
-#: ../inc/result.inc:641
+#: ../inc/result.inc:645
 msgid "Validate state"
 msgstr "验证状态"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "设备最高FLOPS(每秒浮点运算次数)"
+
+#: ../inc/result.inc:648
 msgid "Application version"
 msgstr "计算程序版本"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
 msgstr "输出文件"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
 msgstr "标准错误输出"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "状态"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
 msgstr "任务名称:"
 
@@ -1698,17 +1926,7 @@ msgstr "关键字"
 msgid "Find teams with these words in their names or descriptions"
 msgstr "寻找名称或描述中包含这些关键字的团队"
 
-#: ../inc/team.inc:43 ../inc/team.inc:122 ../inc/team.inc:233
-#: ../inc/team.inc:373 ../inc/team.inc:455 ../inc/user.inc:205
-#: ../inc/user.inc:317 ../user/account_finish.php:45
-#: ../user/create_account_form.php:98 ../user/edit_user_info_form.php:38
-#: ../user/profile_search_action.php:42 ../user/team_email_list.php:64
-#: ../user/team_search.php:72 ../user/top_users.php:63
-#: ../user/user_search.php:53 ../user/user_search.php:140
-msgid "Country"
-msgstr "国家或地区"
-
-#: ../inc/team.inc:49 ../inc/team.inc:453
+#: ../inc/team.inc:49 ../inc/team.inc:468
 msgid "Type of team"
 msgstr "团队类型"
 
@@ -1716,7 +1934,7 @@ msgstr "团队类型"
 msgid "Show only active teams"
 msgstr "只显示活跃的团队"
 
-#: ../inc/team.inc:52 ../user/profile_menu.php:76 ../user/user_search.php:70
+#: ../inc/team.inc:52 ../user/profile_menu.php:78 ../user/user_search.php:70
 msgid "Search"
 msgstr "搜索"
 
@@ -1736,8 +1954,8 @@ msgstr "请求已由你发起过"
 msgid "founder response deadline is %1"
 msgstr "原创建人的回复期限是 %1"
 
-#: ../inc/team.inc:72 ../inc/team.inc:555 ../inc/user.inc:281
-#: ../inc/user.inc:371
+#: ../inc/team.inc:72 ../inc/team.inc:570 ../inc/user.inc:358
+#: ../inc/user.inc:449
 msgid "None"
 msgstr "未加入团队"
 
@@ -1753,486 +1971,477 @@ msgstr "延期处理中"
 msgid "Team info"
 msgstr "团队信息"
 
-#: ../inc/team.inc:89 ../user/team_forum.php:70 ../user/team_search.php:69
+#: ../inc/team.inc:89 ../user/team_forum.php:72 ../user/team_search.php:82
 msgid "Description"
 msgstr "描述"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:101
 msgid "Web site"
 msgstr "网站"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:127
 msgid "Cross-project stats"
 msgstr "跨项目的统计网站"
 
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:130 ../inc/team.inc:383 ../user/team_search.php:84
 msgid "Type"
 msgstr "类型"
 
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:134 ../user/team_manage.php:65
 msgid "Message board"
 msgstr "留言板"
 
-#: ../inc/team.inc:128 ../user/forum_forum.php:135 ../user/forum_index.php:93
+#: ../inc/team.inc:135 ../user/forum_forum.php:138 ../user/forum_index.php:98
 msgid "Threads"
 msgstr "主题"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:143
 msgid "Join this team"
 msgstr "加入该团队"
 
-#: ../inc/team.inc:137
+#: ../inc/team.inc:144
 msgid ""
 "Note: if 'OK to email' is set in your project preferences, joining a team "
 "gives its founder access to your email address."
 msgstr "如果你在项目参数中设置了允许接收电子邮件,加入团队后该团队的创建人将可以访问到你的电子邮件地址。"
 
-#: ../inc/team.inc:140
+#: ../inc/team.inc:147
 msgid "Not accepting new members"
 msgstr "不接受新成员加入"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:154
 msgid "Foundership change requested"
 msgstr "创建人改变请求待处理"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:155
 msgid "Respond by %1"
 msgstr "回复期限 %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:159
 msgid "Team foundership change"
 msgstr "团队创建人改变"
 
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:163 ../inc/team.inc:368
 msgid "Members"
 msgstr "成员"
 
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:164 ../inc/team.inc:263
 msgid "Founder"
 msgstr "创建人"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:178
 msgid "Admins"
 msgstr "管理员"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:193
 msgid "New members in last day"
 msgstr "昨天新加入的成员"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:194
 msgid "Total members"
 msgstr "所有成员"
 
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:194 ../inc/team.inc:195 ../inc/team.inc:196
 msgid "view"
 msgstr "查看"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:195
 msgid "Active members"
 msgstr "活跃的成员"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:196
 msgid "Members with credit"
 msgstr "有积分的成员"
 
-#: ../inc/team.inc:256
+#: ../inc/team.inc:265
 msgid "Admin"
 msgstr "管理员"
 
-#: ../inc/team.inc:277 ../user/forum_user_posts.php:122
-#: ../user/top_hosts.php:93 ../user/top_teams.php:121
-#: ../user/top_users.php:127
+#: ../inc/team.inc:286 ../user/forum_user_posts.php:124
+#: ../user/top_hosts.php:93 ../user/top_teams.php:123
+#: ../user/top_users.php:128
 msgid "Previous %1"
 msgstr "前 %1"
 
-#: ../inc/team.inc:281 ../user/forum_user_posts.php:131
-#: ../user/profile_search_action.php:61 ../user/top_hosts.php:98
-#: ../user/top_teams.php:126 ../user/top_users.php:132
+#: ../inc/team.inc:290 ../user/forum_user_posts.php:133
+#: ../user/profile_search_action.php:63 ../user/top_hosts.php:98
+#: ../user/top_teams.php:128 ../user/top_users.php:133
 msgid "Next %1"
 msgstr "后面 %1"
 
-#: ../inc/team.inc:289
+#: ../inc/team.inc:298
 msgid "No such team."
 msgstr "没有这个团队。"
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:311
 msgid "This operation requires foundership."
 msgstr "本操作需要创建人权限。"
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:335
 msgid "This operation requires team admin privileges"
 msgstr "本操作需要团队创建人的权限"
 
-#: ../inc/team.inc:422
+#: ../inc/team.inc:437
 msgid ""
 "WARNING: this is a BOINC-wide team. If you make changes here, they will soon"
 " be overwritten. Edit the %1BOINC-wide team%2 instead."
 msgstr "警告:这是一个 BOINC 自动创建的团队,你在此处做出的修改将很快被覆盖掉,请直接在 %1这里%2 进行编辑。"
 
-#: ../inc/team.inc:428
+#: ../inc/team.inc:443
 msgid ""
 "%1Privacy note%2: if you create a team, your project preferences (resource "
 "share, graphics preferences) will be visible to the public."
 msgstr "%1隐私事项%2:如果你要创建一个团队,则你的项目参数(资源分享率,图形参数设置等)将会对团队成员公开。"
 
-#: ../inc/team.inc:432
+#: ../inc/team.inc:447
 msgid "Team name, text version"
 msgstr "团队名称,文字版本"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:448
 msgid "Don't use HTML tags."
 msgstr "请不要使用 HTML 标记。"
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:451
 msgid "Team name, HTML version"
 msgstr "团队名称,HTML 版本"
 
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:453 ../inc/team.inc:463
 msgid "You may use %1limited HTML tags%2."
 msgstr "你可以使用 %1有限的 HTML 标记%2。"
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:454
 msgid "If you don't know HTML, leave this box blank."
 msgstr "如果你不了解 HTML,请保持本编辑框为空。"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "URL of team web page, if any"
 msgstr "团队的网址(如果有的话):"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:457
 msgid "without \"http://\""
 msgstr "不包括 \"http://\""
 
-#: ../inc/team.inc:443
+#: ../inc/team.inc:458
 msgid "This URL will be linked to from the team's page on this site."
 msgstr "本网站该团队的页面上将链接到这个网址。"
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:461
 msgid "Description of team"
 msgstr "团队描述"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:477
 msgid "Accept new members?"
 msgstr "是否接受新的团队成员?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
 msgstr "用户档案"
 
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
 msgstr "你已参与的项目"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
 msgstr "%1 已参与的项目"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Project"
 msgstr "项目"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Click for user page"
 msgstr "点击访问用户页面"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
 msgstr "加入日期"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
 msgstr "计算和积分情况"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
 msgstr "本帐户所属的计算机"
 
-#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
-#: ../user/view_profile.php:64
+#: ../inc/user.inc:154 ../inc/user.inc:155 ../inc/user.inc:233
+#: ../inc/user.inc:312 ../inc/user.inc:407 ../inc/user.inc:482
+#: ../user/view_profile.php:66
 msgid "View"
 msgstr "查看"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
 msgstr "跨项目标识符(CPID)"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
 msgstr "跨项目的统计网站"
 
-#: ../inc/user.inc:163
+#: ../inc/user.inc:166
 msgid "Account"
 msgstr "帐户"
 
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:168 ../inc/user.inc:358 ../inc/user.inc:447
+#: ../inc/user.inc:449 ../user/user_search.php:124
 msgid "Team"
 msgstr "团队"
 
-#: ../inc/user.inc:167
+#: ../inc/user.inc:170
 msgid "Cross-project"
 msgstr "跨项目"
 
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
+#: ../inc/user.inc:171
 msgid "Certificate"
 msgstr "计算证书"
 
-#: ../inc/user.inc:169
+#: ../inc/user.inc:172
 msgid "Stats on your cell phone"
 msgstr "用手机查看你的统计信息"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr "未知的通知类型:%1"
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
 msgstr "帐户信息"
 
-#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
-#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
+#: ../inc/user.inc:206 ../user/get_passwd.php:31
+#: ../user/team_email_list.php:73
 msgid "Email address"
 msgstr "电子邮件地址"
 
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:210 ../inc/user.inc:400
 msgid "URL"
 msgstr "网址"
 
-#: ../inc/user.inc:206
+#: ../inc/user.inc:213
 msgid "Postal code"
 msgstr "邮编"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
 msgstr "加入 %1 的日期"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
 msgstr "修改"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
 msgstr "电子邮件地址"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
 msgstr "用户口令"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
 msgstr "其它帐户信息"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
 msgstr "用户 ID"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
 msgstr "在社区功能中使用"
 
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "帐户密钥"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
 msgstr "参数设置"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
 msgstr "BOINC 如何使用你的计算机"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
 msgstr "计算参数设置"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
 msgstr "留言板和私人消息"
 
-#: ../inc/user.inc:229 ../user/edit_forum_preferences_form.php:31
+#: ../inc/user.inc:245 ../user/edit_forum_preferences_form.php:31
 msgid "Community preferences"
 msgstr "社区参数设置"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
 msgstr "本项目的参数设置"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
 msgstr "%1参数设置"
 
-#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../inc/user.inc:266
+msgid "View the profile of %1"
+msgstr "查看 %1 的用户档案"
+
+#: ../inc/user.inc:267 ../inc/user.inc:316 ../inc/user.inc:482
+msgid "Profile"
+msgstr "用户档案"
+
+#: ../inc/user.inc:307 ../user/sample_index.php:114
 msgid "Community"
 msgstr "社区"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr "删除"
-
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "创建"
 
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
-msgid "Profile"
-msgstr "用户档案"
-
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:321 ../inc/user.inc:454
 msgid "%1 posts"
 msgstr "%1 个帖子"
 
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#: ../inc/user.inc:339 ../user/edit_forum_preferences_form.php:40
 msgid "Notifications"
 msgstr "通知"
 
-#: ../inc/user.inc:269
+#: ../inc/user.inc:346
 msgid "Quit team"
 msgstr "退出团队"
 
-#: ../inc/user.inc:271 ../inc/user.inc:288
+#: ../inc/user.inc:348 ../inc/user.inc:365
 msgid "Administer"
 msgstr "管理"
 
-#: ../inc/user.inc:277 ../inc/user.inc:290
+#: ../inc/user.inc:354 ../inc/user.inc:367
 msgid "(foundership change request pending)"
 msgstr "(创建人转换请求待处理)"
 
-#: ../inc/user.inc:279
+#: ../inc/user.inc:356
 msgid "Member of team"
 msgstr "团队成员"
 
-#: ../inc/user.inc:281
+#: ../inc/user.inc:358
 msgid "find a team"
 msgstr "寻找团队"
 
-#: ../inc/user.inc:292
+#: ../inc/user.inc:369
 msgid "Founder but not member of"
 msgstr "创建人(已退出团队)"
 
-#: ../inc/user.inc:298
+#: ../inc/user.inc:375
 msgid "Find friends"
 msgstr "寻找好友"
 
-#: ../inc/user.inc:305 ../inc/user.inc:307 ../inc/user.inc:385
-#: ../inc/user.inc:387 ../inc/user.inc:396
+#: ../inc/user.inc:383 ../inc/user.inc:385 ../inc/user.inc:465
+#: ../inc/user.inc:467 ../inc/user.inc:476
 msgid "Friends"
 msgstr "好友"
 
-#: ../inc/user.inc:329 ../inc/user.inc:331 ../user/server_status.php:392
+#: ../inc/user.inc:407 ../inc/user.inc:409 ../user/server_status.php:153
 msgid "Computers"
 msgstr "计算机"
 
-#: ../inc/user.inc:338
+#: ../inc/user.inc:415
 msgid "Donor"
 msgstr "捐助者"
 
-#: ../inc/user.inc:378
+#: ../inc/user.inc:458
 msgid "Contact"
 msgstr "联系"
 
-#: ../inc/user.inc:381
+#: ../inc/user.inc:461
 msgid "This person is a friend"
 msgstr "这是一位好友"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
 msgstr "删除该好友"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
 msgstr "请求待处理"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
 msgstr "添加为好友"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
 msgstr "用户名前后不能有空格"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
 msgstr "用户名不得为空"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
 msgstr "用户名不得含有 HTML 标签"
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
 msgstr "注销"
 
-#: ../inc/util.inc:133
+#: ../inc/util.inc:163
 msgid "log in"
 msgstr "登录"
 
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
-msgid "Log in"
-msgstr "登录"
-
-#: ../inc/util.inc:205 ../user/create_account_form.php:40
+#: ../inc/util.inc:239 ../user/create_account_form.php:41
 msgid "Create an account"
 msgstr "创建帐户"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
 msgstr "服务器状态页面"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
 msgstr "服务器在处理你的请求过程中发生了一次数据库错误,请稍后重试。"
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
 msgstr "无法处理请求"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
 msgstr "时"
 
-#: ../inc/util.inc:280
+#: ../inc/util.inc:309
 msgid "min"
 msgstr "分"
 
-#: ../inc/util.inc:283
+#: ../inc/util.inc:312
 msgid "sec"
 msgstr "秒"
 
-#: ../inc/util.inc:444
+#: ../inc/util.inc:473
 msgid ""
 "Link has timed out. Please click Back, refresh the page, and try again."
 msgstr "链接已经超时,请点击返回并刷新页面后再重试。"
 
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "查看 %1 的用户档案"
-
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr "使用 BBCode 标记来格式化你的正文"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
 msgstr "项目已停止进行维护"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
 msgstr "%1 已经临时关闭并进行维护工作,请稍后重试。"
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
 msgstr "无法连接数据库 - 请稍后重试"
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
 msgstr "无法选择数据库 - 请稍后重试"
 
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "剩余字符数"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
 msgstr "保持这台计算机上的登录状态"
 
@@ -2240,22 +2449,6 @@ msgstr "保持这台计算机上的登录状态"
 msgid "Finish account setup"
 msgstr "完成账户设定"
 
-#: ../user/account_finish.php:41 ../user/create_account_form.php:79
-msgid "Identifies you on our web site. Use your real name or a nickname."
-msgstr "你在我们网站上的标识,可以使用你的真实姓名或是昵称。"
-
-#: ../user/account_finish.php:45 ../user/create_account_form.php:98
-msgid "Select the country you want to represent, if any."
-msgstr "选择你所希望代表的国家或地区。"
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Postal or ZIP Code"
-msgstr "邮编"
-
-#: ../user/account_finish.php:51 ../user/create_account_form.php:104
-msgid "Optional"
-msgstr "可选的"
-
 #: ../user/account_finish_action.php:27
 msgid "You must supply a name for your account"
 msgstr "你必须为你的帐户提供一个名称"
@@ -2264,34 +2457,38 @@ msgstr "你必须为你的帐户提供一个名称"
 msgid "HTML tags not allowed in name"
 msgstr "名称中不允许使用 HTML 标记"
 
-#: ../user/add_venue.php:81
+#: ../user/add_venue.php:40 ../user/add_venue.php:64 ../user/prefs_edit.php:41
+#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+msgid "Edit %1 preferences"
+msgstr "编辑 %1 的参数设置"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr "增加 %1 参数设置(用于 %2)"
 
-#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
+#: ../user/apps.php:31 ../user/sample_index.php:104
 msgid "Applications"
 msgstr "计算程序"
 
-#: ../user/apps.php:33
+#: ../user/apps.php:32
 msgid ""
 "%1 currently has the following applications. When you participate in %1, "
-"work for one or more of these applications will be assigned to your "
+"tasks for one or more of these applications will be assigned to your "
 "computer. The current version of the application will be downloaded to your "
 "computer. This happens automatically; you don't have to do anything."
-msgstr "%1 目前有如下几个计算程序。当你参与 %1 项目时,适用于这些计算程序的任务包将会分发给你的计算机。当前版本的计算程序也会下载到你的计算机上。这一切都是自动的,你不需要做任何操作。"
+msgstr "%1 项目目前有如下几个计算程序。当你参与 %1 项目时,适用于这些计算程序的任务包将会分发给你的计算机。当前版本的计算程序也会下载到你的计算机上。这一切都是自动的,你不需要做任何操作。"
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "平台"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
 msgstr "版本"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "发布时间"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "平均计算"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2322,153 +2519,79 @@ msgid "Underline"
 msgstr "下划线"
 
 #: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "删除线"
+
+#: ../user/bbcode.php:36
 msgid "Superscript"
 msgstr "上标"
 
-#: ../user/bbcode.php:36
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "大号文字"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
 msgstr "红色文字"
 
-#: ../user/bbcode.php:38
+#: ../user/bbcode.php:39
 msgid "link to website"
 msgstr "链接到网站"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "Quoted text"
 msgstr "被引用的文字"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
 msgstr "用于文本块的引用"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
 msgstr "用于显示一张图片"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
 msgstr "这是代码片段"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
 msgstr "用于显示一些代码"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
 msgstr "预格式文本"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
 msgstr "用于显示预格式文本(一般是等宽字体)"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
 msgstr "条目1"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
 msgstr "条目2"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
 msgstr "条目2"
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
 msgstr "用于链接到 BOINC 网站上的 Trac 传票"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "用于链接到 BOINC 网站上的 Trac 维基"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "用于链接到 BOINC 网站上的 SVN 修改集"
-
-#: ../user/bbcode.php:53
+#: ../user/bbcode.php:52
 msgid ""
 "If you don't close a tag or don't specify a parameter correctly,\n"
 "the raw tag itself will display instead of the formatted text."
 msgstr "如果你没有正确的闭合标签或者指定参数,\n标签自身将被显示出来,而不是预格式的文本。"
 
-#: ../user/bs_sample_index.php:44
-msgid "Participants"
-msgstr "参与者"
-
-#: ../user/bs_sample_index.php:46
-msgid "Do work"
-msgstr "执行任务"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-#: ../user/home.php:49 ../project.sample/project.inc:43
-msgid "Your account"
-msgstr "你的帐户"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-msgid "view stats, modify preferences"
-msgstr "查看统计信息,修改参数设置"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-#: ../user/team.php:25
-msgid "Teams"
-msgstr "团队"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-msgid "create or join a team"
-msgstr "创建或加入一个团队"
-
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
-msgid "User of the day"
-msgstr "今日用户"
-
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-msgid "Server status"
-msgstr "服务器状态"
-
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
-msgid "Profiles"
-msgstr "用户档案"
-
-#: ../user/bs_sample_index.php:61
-msgid "User search"
-msgstr "用户搜索"
-
-#: ../user/bs_sample_index.php:64
-msgid "Statistics"
-msgstr "统计"
-
-#: ../user/bs_sample_index.php:65 ../user/stats.php:30
-#: ../user/top_users.php:116
-msgid "Top participants"
-msgstr "用户排名"
-
-#: ../user/bs_sample_index.php:66 ../user/stats.php:31
-msgid "Top computers"
-msgstr "主机排名"
-
-#: ../user/bs_sample_index.php:67 ../user/stats.php:32 ../user/team.php:46
-msgid "Top teams"
-msgstr "团队排名"
-
-#: ../user/bs_sample_index.php:68 ../user/gpu_list.php:182
-#: ../user/stats.php:33
-msgid "Top GPU models"
-msgstr "GPU 型号排名"
-
-#: ../user/bs_sample_index.php:70
-msgid "Languages"
-msgstr "语言"
-
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "阅读规定和政策"
-
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
 msgstr "无法创建账户"
@@ -2477,192 +2600,152 @@ msgstr "无法创建账户"
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr "点击浏览器的<b>返回</b>按钮以重试。"
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
 msgstr "你输入的验证字符不正确,请重试。"
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
 msgstr "你必须提供一个邀请码才能创建帐户。"
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
 msgstr "你提供的邀请码是错误的。"
 
-#: ../user/create_account_action.php:84
+#: ../user/create_account_action.php:83
 msgid ""
 "Invalid email address: you must enter a valid address of the form "
 "name at domain"
 msgstr "电子邮件地址错误:你必须输入一个合法的地址,形式如 '用户名@域名'"
 
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:87
 msgid "There's already an account with that email address."
 msgstr "已有账户关联至该电子邮箱地址。"
 
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:93 ../user/edit_passwd_action.php:32
 msgid "New passwords are different"
 msgstr "新输入的口令不相符"
 
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:100 ../user/edit_passwd_action.php:40
 msgid "Passwords may only include ASCII characters."
 msgstr "登录口令中只允许包含 ASCII 字符。"
 
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:105 ../user/edit_passwd_action.php:44
 msgid "New password is too short: minimum password length is %1 characters."
 msgstr "新口令长度过短:最少的口令长度为 %1 字符。"
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
 msgstr "无法创建帐户"
 
-#: ../user/create_account_form.php:44
+#: ../user/create_account_form.php:45
 msgid ""
 "NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
 "select Add Project, and enter an email address and password."
 msgstr "注意:如果你有 BOINC Manager,可以不使用这个表单。直接在 BOINC Manager 中选择添加项目并且输入电子邮箱地址和项目口令。"
 
-#: ../user/create_account_form.php:61
+#: ../user/create_account_form.php:57
 msgid ""
 "This account will belong to the team %1 and will have the project "
 "preferences of its founder."
 msgstr "此帐户将属于 %1 团队并且其项目参数的默认值和团队创建人的项目参数相同。"
 
-#: ../user/create_account_form.php:73
-msgid "Invitation Code"
-msgstr "邀请码"
-
-#: ../user/create_account_form.php:73
-msgid "A valid invitation code is required to create an account."
-msgstr "创建帐户时需要一个正确的邀请码。"
-
-#: ../user/create_account_form.php:83
-msgid "Email Address"
-msgstr "电子邮件地址"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "必须是有效的电子邮件地址,形式如 '用户名@域名'。"
-
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
-msgid "Password"
-msgstr "用户口令"
-
-#: ../user/create_account_form.php:93
-msgid "Must be at least %1 characters"
-msgstr "必须至少包含 %1 个字符"
-
-#: ../user/create_account_form.php:96
-msgid "Confirm password"
-msgstr "确认用户口令"
-
-#: ../user/create_account_form.php:113
-msgid "Please enter the words shown in the image"
-msgstr "请输入图片中显示的单词"
-
-#: ../user/create_account_form.php:119
-msgid "Create account"
-msgstr "创建帐户"
-
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
 msgstr "照片"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
 msgstr "%1你的用户档案图片将显示在左边"
 
-#: ../user/create_profile.php:66
+#: ../user/create_profile.php:68
 msgid ""
 "To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
 " or less)."
 msgstr "要替换的话,点击“浏览”按钮并选择一个 JPEG 或 PNG 文件(大小不超过 %1)。"
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
 msgstr "如果想从用户档案中删除它,请选择:"
 
-#: ../user/create_profile.php:77
+#: ../user/create_profile.php:79
 msgid ""
 "If you would like include a picture with your profile, click the \"Browse\" "
 "button and select a JPEG or PNG file. Please select images of %1 or less."
 msgstr "如果你想在用户档案中包含一张照片,点击“浏览”按钮并选择一个 JPEG 或 PNG 文件。文件大小不能超过 %1。"
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
 msgstr "语言"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
 msgstr "请选择你写用户档案所用的语言:"
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
 msgstr "提交用户档案"
 
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr "请输入图片中显示的单词。"
-
-#: ../user/create_profile.php:115
+#: ../user/create_profile.php:112
 msgid "Create/edit profile"
 msgstr "创建/编辑用户档案"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
 msgstr "你上传的图片格式不支持。"
 
-#: ../user/create_profile.php:166
+#: ../user/create_profile.php:163
 msgid ""
 "Your %1profile%2 lets you share your opinions and background with the %3 "
 "community."
 msgstr "通过 %1用户档案%2,你可以和 %3 社区分享你的观点和背景。"
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
 msgstr "你的验证字符回复不正确,请重试。"
 
-#: ../user/create_profile.php:222
+#: ../user/create_profile.php:218
 msgid ""
 "Your first response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "你的第一次回复已被 Akismet 防垃圾信息系统标记为垃圾信息,请修改你输入的内容并重试。"
 
-#: ../user/create_profile.php:230
+#: ../user/create_profile.php:226
 msgid ""
 "Your second response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "你的第二次回复已被 Akismet 防垃圾信息系统标记为垃圾信息,请修改你输入的内容并重试。"
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
 msgstr "你提交的用户档案内容为空。"
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:281
 msgid "Could not update the profile: database error"
 msgstr "无法更新该用户档案:数据库错误"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:293
 msgid "Could not create the profile: database error"
 msgstr "无法创建该用户档案:数据库错误"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:298
 msgid "Profile saved"
 msgstr "用户档案内容已保存"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:300
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
 msgstr "恭喜!你的用户档案已经成功进入了我们的数据库。"
 
-#: ../user/create_profile.php:306
+#: ../user/create_profile.php:302
 msgid "%1View your profile%2"
 msgstr "%1查看你的用户档案%2"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:311
 msgid "Create a profile"
 msgstr "创建一个用户档案"
 
-#: ../user/create_profile.php:343
+#: ../user/create_profile.php:339
 msgid ""
 "To prevent spam, an average credit of %1 or greater is required to create or"
 " edit a profile.  We apologize for this inconvenience."
@@ -2703,9 +2786,9 @@ msgstr "该操作无法撤销。\n一旦账户被删除,你将无法再取回
 msgid "Are you sure you want to delete your account?"
 msgstr "你确定要删除你的账户吗?"
 
-#: ../user/delete_account.php:79 ../user/delete_profile.php:52
-#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238
-#: ../user/prefs_remove.php:52 ../user/user_search.php:59
+#: ../user/delete_account.php:79 ../user/delete_profile.php:54
+#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:240
+#: ../user/prefs_remove.php:53 ../user/user_search.php:59
 #: ../user/user_search.php:64
 msgid "Yes"
 msgstr "是的"
@@ -2714,8 +2797,8 @@ msgstr "是的"
 msgid "Delete this account"
 msgstr "删除当前账户"
 
-#: ../user/delete_account.php:80 ../user/delete_profile.php:53
-#: ../user/friend.php:239 ../user/user_search.php:58
+#: ../user/delete_account.php:80 ../user/delete_profile.php:55
+#: ../user/friend.php:241 ../user/user_search.php:58
 #: ../user/user_search.php:63
 msgid "No"
 msgstr "不是"
@@ -2724,44 +2807,44 @@ msgstr "不是"
 msgid "Do not delete this account"
 msgstr "不要删除当前账户"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
 msgstr "无法删除个人档案 - 请稍后再试。"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "删除确认"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
 msgstr "你的账户已被删除。"
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
 msgstr "个人档案删除确认"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
 msgstr "你确定吗?"
 
-#: ../user/delete_profile.php:44
+#: ../user/delete_profile.php:46
 msgid ""
 "Deleted profiles are gone forever and cannot be recovered --\n"
 "you will have to start from scratch\n"
 "if you want another profile in the future."
 msgstr "删除的个人档案将永远无法恢复 --\n如果你以后想要重新使用个人档案,必须从头开始创建。"
 
-#: ../user/delete_profile.php:48
+#: ../user/delete_profile.php:50
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
 msgstr "如果你确定的话,请点击“是”\n来从我们的数据库中删除你的个人档案。"
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
 msgstr "创建我的账户"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
 msgstr "不要删除我的账户"
 
@@ -2942,241 +3025,201 @@ msgstr "该操作将清除你对社区参数所有的修改,要取消操作的
 msgid "Reset preferences"
 msgstr "重置参数设置"
 
-#: ../user/edit_forum_preferences_action.php:88
+#: ../user/edit_forum_preferences_action.php:95
 msgid "Error: Not the right kind of file, only PNG and JPEG are supported."
 msgstr "错误:文件类型错误,只支持 PNG 和 JPEG 格式。"
 
-#: ../user/edit_forum_preferences_action.php:114
+#: ../user/edit_forum_preferences_action.php:120
 msgid "Your signature was too long, please keep it less than 250 characters."
 msgstr "你和签名太长,请将其限制在 250 个字符内。"
 
-#: ../user/edit_forum_preferences_action.php:132
-#: ../user/edit_forum_preferences_action.php:146
+#: ../user/edit_forum_preferences_action.php:139
+#: ../user/edit_forum_preferences_action.php:153
 msgid "No such user: %1"
 msgstr "没有这个用户:%1"
 
-#: ../user/edit_forum_preferences_form.php:56
+#: ../user/edit_forum_preferences_form.php:45
 msgid ""
 "How should we notify you of new private messages, friend requests, posts in "
 "subscribed threads, and other events?"
 msgstr "当你接收到新的私人消息、好友请求、订阅主题更新等时,你希望我们如何通知你?"
 
-#: ../user/edit_forum_preferences_form.php:57
+#: ../user/edit_forum_preferences_form.php:46
 msgid "On my Account page (no email)"
 msgstr "在我的账户页面(不发送电子邮件)"
 
-#: ../user/edit_forum_preferences_form.php:58
+#: ../user/edit_forum_preferences_form.php:47
 msgid "Immediately, by email"
 msgstr "立即,通过电子邮件"
 
-#: ../user/edit_forum_preferences_form.php:59
+#: ../user/edit_forum_preferences_form.php:48
 msgid "In a single daily email"
 msgstr "通过电子邮件,每天最多一封"
 
-#: ../user/edit_forum_preferences_form.php:75
+#: ../user/edit_forum_preferences_form.php:65
 msgid "Message-board identity"
 msgstr "留言板标识"
 
-#: ../user/edit_forum_preferences_form.php:76
+#: ../user/edit_forum_preferences_form.php:66
 msgid "Avatar"
 msgstr "头像"
 
-#: ../user/edit_forum_preferences_form.php:77
+#: ../user/edit_forum_preferences_form.php:67
 msgid "An image representing you on the message boards."
 msgstr "在留言板上代表你身份的图片。"
 
-#: ../user/edit_forum_preferences_form.php:78
+#: ../user/edit_forum_preferences_form.php:68
 msgid "Format: JPG or PNG. Size: at most 4 KB, 100x100 pixels"
 msgstr "格式:JPG 或 PNG。尺寸:最大 4KB,100x100像素"
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
 msgstr "不使用头像"
 
-#: ../user/edit_forum_preferences_form.php:82
+#: ../user/edit_forum_preferences_form.php:72
 msgid "Use a Globally Recognized Avatar provided by %1"
 msgstr "使用由 %1 提供的个人全球统一标识"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
 msgstr "使用上传的头像:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
 msgstr "头像预览"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
 msgstr "你的头像将显示为"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
 msgstr "留言板发帖签名"
 
-#: ../user/edit_forum_preferences_form.php:99
+#: ../user/edit_forum_preferences_form.php:89
 msgid ""
 "Check out %1various free services%2\n"
 "<br> providing dynamic 'signature images'\n"
 "<br> showing your latest credit info, project news, etc."
 msgstr "查看 %1所有的免费服务%2\n<br> 提供动态签名图片\n<br> 显示你最新的积分信息,项目新闻等。"
 
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr "剩余字符数"
-
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
 msgstr "默认使用签名"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
 msgstr "签名预览"
 
-#: ../user/edit_forum_preferences_form.php:109
+#: ../user/edit_forum_preferences_form.php:97
 msgid "This is how your signature will look in the forums"
 msgstr "你的签名将在论坛中显示为"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "消息显示"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
 msgstr "显示内容"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
 msgstr "隐藏头像图片"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
 msgstr "隐藏签名"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
 msgstr "将图片显示为链接"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
 msgstr "在新窗口/标签页中打开链接"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
 msgstr "高亮指定的用户"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
 msgstr "每页显示的消息数目"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
 msgstr "如何排序"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "主题:"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "贴子:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
 msgstr "自动跳转到第一篇未读的帖子"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
 msgstr "不要把置顶文章放在页面顶部"
 
-#: ../user/edit_forum_preferences_form.php:148
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
 msgstr "消息过滤"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
 msgstr "已过滤的用户"
 
-#: ../user/edit_forum_preferences_form.php:165
+#: ../user/edit_forum_preferences_form.php:154
 msgid "Ignore message board posts and private messages from these users."
 msgstr "忽略这些用户在留言板中的帖子和私人消息。"
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
 msgstr "用户 ID(比如:123456789)"
 
-#: ../user/edit_forum_preferences_form.php:168 ../user/pm.php:251
+#: ../user/edit_forum_preferences_form.php:157 ../user/pm.php:256
 msgid "Add user to filter"
 msgstr "添加用户到过滤器"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
 msgstr "点击这里更新参数设置"
 
-#: ../user/edit_forum_preferences_form.php:175
-#: ../user/edit_forum_preferences_form.php:177
+#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:166
 msgid "Reset"
 msgstr "重置"
 
-#: ../user/edit_forum_preferences_form.php:176
+#: ../user/edit_forum_preferences_form.php:165
 msgid "Or click here to reset preferences to the defaults"
 msgstr "或者点击这里将所有参数复位至缺省配置"
 
 #: ../user/edit_passwd_action.php:50
-msgid "Invalid account key"
-msgstr "错误的帐户密钥"
-
-#: ../user/edit_passwd_action.php:55
-msgid "No account with that email address was found"
-msgstr "没有账户关联至该电子邮箱地址"
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "错误的用户口令"
-
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
-msgid "Change password"
-msgstr "修改用户口令"
-
-#: ../user/edit_passwd_action.php:67
-msgid "Your password has been changed."
-msgstr "你的用户口令已经修改。"
-
-#: ../user/edit_passwd_action.php:69
 msgid ""
 "We can't update your password due to a database problem. Please try again "
 "later."
 msgstr "因为数据库的问题,我们当前无法更新你的用户口令,请稍后重试。"
 
-#: ../user/edit_passwd_form.php:39
-msgid "You can identify yourself using either"
-msgstr "你可以声明你的帐户,通过"
-
-#: ../user/edit_passwd_form.php:41
-msgid "your email address and old password"
-msgstr "你的电子邮箱地址和旧的用户口令"
-
-#: ../user/edit_passwd_form.php:42
-msgid "your account key"
-msgstr "你的帐户密钥"
-
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr "当前的用户口令"
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr "<b>或者</b>:帐户密钥"
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
+msgid "Change password"
+msgstr "修改用户口令"
 
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr "通过电子邮件获取帐户密钥"
+#: ../user/edit_passwd_action.php:54
+msgid "Your password has been changed."
+msgstr "你的用户口令已经修改。"
 
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
 msgstr "新的用户口令"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
 msgstr "再次输入新的用户口令"
 
@@ -3387,19 +3430,19 @@ msgstr "使用浏览器的返回按钮来回退到消息表单页面"
 msgid "Sending emails"
 msgstr "发送电子邮件"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr "电子邮件已成功发送给 %1"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr "无法发送电子邮件给 %1:%2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr "感谢你向好友们介绍了 %1"
 
-#: ../user/ffmail_action.php:94
+#: ../user/ffmail_action.php:92
 msgid ""
 "You forgot to enter your friends' names and/or email addresses; Please "
 "%1return to the form%2 and enter them."
@@ -3450,79 +3493,73 @@ msgstr "附加消息(可选)"
 msgid "Send"
 msgstr "发送"
 
-#: ../user/forum_banishment_vote.php:35
-#: ../user/forum_banishment_vote_action.php:33
+#: ../user/forum_banishment_vote.php:37
+#: ../user/forum_banishment_vote_action.php:35
 msgid "You are not authorized to banish users."
 msgstr "你没有权限封禁用户。"
 
-#: ../user/forum_banishment_vote.php:41 ../user/forum_banishment_vote.php:46
+#: ../user/forum_banishment_vote.php:43 ../user/forum_banishment_vote.php:48
 msgid "Banishment Vote"
 msgstr "封禁投票"
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
 msgstr "找不到相应 ID 的用户"
 
-#: ../user/forum_banishment_vote.php:54 ../user/forum_moderate_post.php:76
+#: ../user/forum_banishment_vote.php:57 ../user/forum_moderate_post.php:79
 msgid "User is already banished"
 msgstr "用户已被封禁"
 
-#: ../user/forum_banishment_vote.php:59 ../user/forum_moderate_post.php:79
+#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_post.php:82
 msgid ""
 "Are you sure you want to banish %1?<br/>This will prevent %1 from posting "
 "for chosen time period.<br/>It should be done only if %1 has consistently "
 "exhibited trollish behavior."
 msgstr "你确定要封禁 %1 吗?<br />该操作将在选定的时间期限内阻止 %1 发帖。<br />该操作只应在 %1 有连续的过激行为时被使用。"
 
-#: ../user/forum_banishment_vote.php:61
+#: ../user/forum_banishment_vote.php:64
 msgid ""
 "Select the reason category, optionally write a longer description of why the"
 " user should be banished."
 msgstr "选择原因分类,可以附上为什么要封禁该用户的原因。"
 
-#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
+#: ../user/forum_banishment_vote.php:65 ../user/forum_moderate_thread.php:56
 msgid "Category"
 msgstr "分类"
 
-#: ../user/forum_banishment_vote.php:64
-#: ../user/forum_banishment_vote_action.php:57
-#: ../user/forum_moderate_post.php:55 ../user/forum_moderate_thread.php:52
+#: ../user/forum_banishment_vote.php:67
+#: ../user/forum_banishment_vote_action.php:59
+#: ../user/forum_moderate_post.php:58 ../user/forum_moderate_thread.php:58
 msgid "Obscene"
 msgstr "淫秽的"
 
-#: ../user/forum_banishment_vote.php:65
-#: ../user/forum_banishment_vote_action.php:59
-#: ../user/forum_moderate_post.php:56 ../user/forum_moderate_thread.php:53
+#: ../user/forum_banishment_vote.php:68
+#: ../user/forum_banishment_vote_action.php:61
+#: ../user/forum_moderate_post.php:59 ../user/forum_moderate_thread.php:59
 msgid "Flame/Hate mail"
 msgstr "有侮辱性的"
 
-#: ../user/forum_banishment_vote.php:66
-#: ../user/forum_banishment_vote_action.php:61
-#: ../user/forum_moderate_post.php:59
+#: ../user/forum_banishment_vote.php:69
+#: ../user/forum_banishment_vote_action.php:63
+#: ../user/forum_moderate_post.php:62
 msgid "User Request"
 msgstr "用户请求"
 
-#: ../user/forum_banishment_vote.php:67
-#: ../user/forum_banishment_vote_action.php:63
-#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:55
-msgid "Other"
-msgstr "其它"
-
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_post.php:53
-#: ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_post.php:56
+#: ../user/forum_moderate_thread.php:100
 msgid "Reason"
 msgstr "原因"
 
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_thread.php:100
 msgid "Mailed if nonempty"
 msgstr "非空则写入电子邮件"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "继续投票"
 
-#: ../user/forum_banishment_vote_action.php:39
-#: ../user/forum_moderate_post_action.php:63
+#: ../user/forum_banishment_vote_action.php:41
+#: ../user/forum_moderate_post_action.php:66
 msgid "You must specify an action..."
 msgstr "你必须指定一个操作..."
 
@@ -3536,7 +3573,7 @@ msgstr "你将无法再编辑该帖子。<br />帖子只能在其被创建后的
 msgid "You are not authorized to edit this post."
 msgstr "你没有权限来编辑该帖子。"
 
-#: ../user/forum_edit.php:86 ../user/forum_search.php:72
+#: ../user/forum_edit.php:86 ../user/forum_search.php:74
 msgid "Forum"
 msgstr "论坛"
 
@@ -3545,828 +3582,828 @@ msgid "Edit your message"
 msgstr "编辑你的消息"
 
 #: ../user/forum_edit.php:115 ../user/forum_edit.php:120
-#: ../user/forum_post.php:109 ../user/forum_post.php:111
-#: ../user/team_forum.php:69
+#: ../user/forum_post.php:113 ../user/forum_post.php:115
+#: ../user/team_forum.php:71
 msgid "Title"
 msgstr "标题"
 
-#: ../user/forum_edit.php:144 ../user/forum_post.php:129
+#: ../user/forum_edit.php:144 ../user/forum_post.php:133
 msgid "Add my signature to this post"
 msgstr "在帖子后附上我的个性签名"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
 msgstr "对你不可见"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "%1 的团队留言板"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "新主题"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
 msgstr "在本论坛发布一个新主题"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
 msgstr "留言板的更新还可以通过 %sRSS%s 来获取"
 
-#: ../user/forum_forum.php:174
+#: ../user/forum_forum.php:178
 msgid "This thread is hidden"
 msgstr "该主题已被隐藏"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "This thread is sticky and locked, and you haven't read it yet"
 msgstr "该主题已置顶和锁定,你当前尚未阅读"
 
-#: ../user/forum_forum.php:178
+#: ../user/forum_forum.php:182
 msgid "sticky/locked/unread"
 msgstr "置顶/锁定/未读"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "This thread is sticky and you haven't read it yet"
 msgstr "该主题已置顶,你当前尚未阅读"
 
-#: ../user/forum_forum.php:180
+#: ../user/forum_forum.php:184
 msgid "sticky/unread"
 msgstr "置顶/未读"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "You haven't read this thread yet, and it's locked"
 msgstr "你还没有阅读该主题,而且这个主题已被锁定"
 
-#: ../user/forum_forum.php:184
+#: ../user/forum_forum.php:188
 msgid "unread/locked"
 msgstr "未读/锁定"
 
-#: ../user/forum_forum.php:186
+#: ../user/forum_forum.php:190
 msgid "You haven't read this thread yet"
 msgstr "你还没有阅读过该主题"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "This thread is sticky and locked"
 msgstr "该主题已被置顶和锁定"
 
-#: ../user/forum_forum.php:192
+#: ../user/forum_forum.php:196
 msgid "sticky/locked"
 msgstr "置顶/锁定"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "This thread is sticky"
 msgstr "该主题已被置顶"
 
-#: ../user/forum_forum.php:194
+#: ../user/forum_forum.php:198
 msgid "sticky"
 msgstr "置顶"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "This thread is locked"
 msgstr "该主题已被锁定"
 
-#: ../user/forum_forum.php:198
+#: ../user/forum_forum.php:202
 msgid "locked"
 msgstr "锁定"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "You read this thread"
 msgstr "你已阅读过本主题"
 
-#: ../user/forum_forum.php:200
+#: ../user/forum_forum.php:204
 msgid "read"
 msgstr "已读"
 
-#: ../user/forum_help_desk.php:27
+#: ../user/forum_help_desk.php:29
 msgid "Questions and answers"
 msgstr "问题和解答"
 
-#: ../user/forum_help_desk.php:30
+#: ../user/forum_help_desk.php:32
 msgid ""
 "Talk live via Skype with a volunteer, in any of several languages. Go to "
 "%1BOINC Online Help%2."
 msgstr "通过 Skype 和志愿者在线交流,支持多种语言,请访问 %1BOINC 在线帮助%2。"
 
-#: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
+#: ../user/forum_help_desk.php:46 ../user/forum_index.php:97
 msgid "Topic"
 msgstr "主题"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "问题"
 
-#: ../user/forum_index.php:53 ../user/team_forum.php:68
+#: ../user/forum_index.php:58 ../user/team_forum.php:70
 msgid "Discussion among members of %1"
 msgstr "%1 成员间的讨论"
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "%1 留言板"
 
-#: ../user/forum_index.php:78
+#: ../user/forum_index.php:83
 msgid ""
 "If you have a question or problem, please use the %1Questions & Answers%2 "
 "section of the message boards."
 msgstr "如果你有问题希望得到解答,请使用留言板中的 %1问题解答%2 区。"
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
 msgstr "已订阅的主题"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "处理帖子"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
 msgstr "隐藏帖子"
 
-#: ../user/forum_moderate_post.php:57 ../user/forum_moderate_thread.php:54
+#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:60
 msgid "Commercial spam"
 msgstr "广告垃圾"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
 msgstr "重复发帖"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "移动帖子"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
 msgstr "目的主题ID:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
 msgstr "封禁用户"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
 msgstr "封禁时间"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4 小时"
 
-#: ../user/forum_moderate_post.php:82 ../user/forum_search.php:45
+#: ../user/forum_moderate_post.php:85 ../user/forum_search.php:47
 msgid "1 day"
 msgstr "1 天"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
 msgstr "一周"
 
-#: ../user/forum_moderate_post.php:84
+#: ../user/forum_moderate_post.php:87
 msgid "2 weeks"
 msgstr "两周"
 
-#: ../user/forum_moderate_post.php:85
+#: ../user/forum_moderate_post.php:88
 msgid "1 month"
 msgstr "1 月"
 
-#: ../user/forum_moderate_post.php:86
+#: ../user/forum_moderate_post.php:89
 msgid "Forever"
 msgstr "永久"
 
-#: ../user/forum_moderate_post.php:96
-msgid "Optional explanation %1 This is included in email to user.%2"
-msgstr "封禁原因 %1将显示在发送给用户的电子邮件中。%2"
-
-#: ../user/forum_moderate_post.php:101 ../user/forum_moderate_thread.php:91
-#: ../user/forum_post.php:130 ../user/forum_report_post.php:85
-#: ../user/forum_rss.php:55 ../user/friend.php:81 ../user/get_passwd.php:41
-#: ../user/get_passwd.php:75
+#: ../user/forum_moderate_post.php:99 ../user/forum_moderate_post.php:112
+#: ../user/forum_moderate_thread.php:106 ../user/forum_post.php:134
+#: ../user/forum_report_post.php:88 ../user/forum_rss.php:51
+#: ../user/friend.php:83 ../user/get_passwd.php:32 ../user/get_passwd.php:75
 msgid "OK"
 msgstr "确定"
 
-#: ../user/forum_moderate_post_action.php:57
+#: ../user/forum_moderate_post.php:107
+msgid "Optional explanation %1 This is included in email to user.%2"
+msgstr "封禁原因 %1将显示在发送给用户的电子邮件中。%2"
+
+#: ../user/forum_moderate_post_action.php:60
 msgid "You are not authorized to moderate this post."
 msgstr "你没有权限来处理当前帖子。"
 
-#: ../user/forum_moderate_post_action.php:85
+#: ../user/forum_moderate_post_action.php:105
 msgid "Can't move to different category type"
 msgstr "无法移动到不同的版面类型"
 
-#: ../user/forum_moderate_post_action.php:89
+#: ../user/forum_moderate_post_action.php:109
 msgid "Can't move to different category"
 msgstr "无法移动到不同的版面"
 
-#: ../user/forum_moderate_post_action.php:110
+#: ../user/forum_moderate_post_action.php:130
 msgid "Not authorized to banish users"
 msgstr "没有权限封禁用户"
 
-#: ../user/forum_moderate_post_action.php:126
+#: ../user/forum_moderate_post_action.php:146
 msgid "Banishment"
 msgstr "封禁"
 
-#: ../user/forum_moderate_post_action.php:128
+#: ../user/forum_moderate_post_action.php:148
 msgid "User %1 has been banished."
 msgstr "用户 %1 已被封禁。"
 
-#: ../user/forum_moderate_post_action.php:131
+#: ../user/forum_moderate_post_action.php:151
 msgid "Action failed: possible database problem"
 msgstr "操作失败:可能是数据库故障"
 
-#: ../user/forum_moderate_thread.php:33
+#: ../user/forum_moderate_thread.php:38
 msgid "not authorized"
 msgstr "未授权"
 
-#: ../user/forum_moderate_thread.php:36
+#: ../user/forum_moderate_thread.php:41
 msgid "Moderate thread '%1'"
 msgstr "处理主题“%1”"
 
-#: ../user/forum_moderate_thread.php:48
+#: ../user/forum_moderate_thread.php:54
 msgid ""
 "Select the reason category, or write a longer description of why you're "
 "hiding or locking the thread; then press OK."
 msgstr "选择处理原因,或者在编辑框中详细说明为什么要隐藏或锁定该主题,然后点击确定。"
 
-#: ../user/forum_moderate_thread.php:72
+#: ../user/forum_moderate_thread.php:78
 msgid "Current forum"
 msgstr "当前论坛"
 
-#: ../user/forum_moderate_thread.php:73
+#: ../user/forum_moderate_thread.php:79
 msgid "Destination forum"
 msgstr "目的论坛"
 
-#: ../user/forum_moderate_thread.php:77
+#: ../user/forum_moderate_thread.php:83
 msgid "New title:"
 msgstr "新的标题:"
 
-#: ../user/forum_post.php:40
+#: ../user/forum_post.php:44
 msgid ""
 "Only project admins may create a thread here. However, you may reply to "
 "existing threads."
 msgstr "只有项目管理员可以在此创建主题,但你可以回复已有的主题。"
 
-#: ../user/forum_post.php:60
+#: ../user/forum_post.php:64
 msgid ""
 "Your message was flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "你的消息已被 Akismet 防垃圾信息系统标记为垃圾信息,请修改你输入的内容并重试。"
 
-#: ../user/forum_post.php:70
+#: ../user/forum_post.php:74
 msgid "Create new thread"
 msgstr "创建新主题"
 
-#: ../user/forum_post.php:100
+#: ../user/forum_post.php:104
 msgid "Create a new thread"
 msgstr "创建新主题"
 
-#: ../user/forum_post.php:105
+#: ../user/forum_post.php:109
 msgid "Remember to add a title"
 msgstr "记得写上标题"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Show this item as a Notice in the BOINC Manager"
 msgstr "将该条目显示为 BOINC 客户端的通知"
 
-#: ../user/forum_post.php:127
+#: ../user/forum_post.php:131
 msgid "Do so only for items likely to be of interest to all volunteers."
 msgstr "仅在所有志愿者都可能对该条目感兴趣的时候使用"
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
 msgstr "评分功能下线"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
 msgstr "该特性已被项目关闭"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
 msgstr "你需要更高的平均积分或总积分才能对帖子进行评分。"
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
 msgstr "你已经评价过该帖子。"
 
-#: ../user/forum_rate.php:62 ../user/forum_rate.php:78
-#: ../user/forum_rate.php:83 ../user/forum_report_post.php:69
-#: ../user/forum_report_post.php:94 ../user/forum_subscribe.php:54
-#: ../user/forum_subscribe.php:69 ../user/forum_thread_status.php:51
+#: ../user/forum_rate.php:64 ../user/forum_rate.php:80
+#: ../user/forum_rate.php:85 ../user/forum_report_post.php:72
+#: ../user/forum_report_post.php:97 ../user/forum_subscribe.php:56
+#: ../user/forum_subscribe.php:71 ../user/forum_thread_status.php:56
 msgid "Return to thread"
 msgstr "返回主题"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
 msgstr "输入已记录"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
 msgstr "输入已经被记录下来,感谢你的帮助。"
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
 msgstr "投票已登记"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
 msgstr "评分已经被记录下来,感谢你的参与。"
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
 msgstr "投票提交故障"
 
-#: ../user/forum_reply.php:73
+#: ../user/forum_reply.php:76
 msgid ""
 "Your post has been flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "你的帖子已被 Akismet 防垃圾信息系统标记为垃圾信息,请修改你输入的内容并重试。"
 
-#: ../user/forum_reply.php:88 ../user/forum_thread.php:158
-#: ../user/forum_thread.php:274
+#: ../user/forum_reply.php:91 ../user/forum_thread.php:159
+#: ../user/forum_thread.php:284
 msgid "Post to thread"
 msgstr "回复该主题"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "消息:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
 msgstr "回复%1消息 ID%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
 msgstr "发表回复"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
 msgstr "在回复中附上我的个性签名"
 
-#: ../user/forum_report_post.php:45
+#: ../user/forum_report_post.php:48
 msgid "You need more average or total credit to report a post."
 msgstr "你需要更高的平均积分或总积分才能举报一个帖子。"
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "举报已记录"
 
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "举报已被记录,感谢你的参与。"
 
-#: ../user/forum_report_post.php:67
+#: ../user/forum_report_post.php:70
 msgid ""
 "A moderator will now look at your report and decide what will happen - this "
 "may take a little while, so please be patient"
 msgstr "管理员将会查看你的举报并决定如何处理 - 可能需要一些时间,请耐心等待"
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "举报论坛帖子"
 
-#: ../user/forum_report_post.php:73
+#: ../user/forum_report_post.php:76
 msgid ""
 "Before reporting this post, consider using the +/- rating system instead. If"
 " enough users rate a post negatively it will eventually be hidden.<br />You "
 "can find the rating system at the bottom of the post."
 msgstr "在举报之前,可以考虑使用 +/- 评分系统。如果足够多的用户给一篇帖子负面评价,该帖子将自动隐藏。<br />你可以在帖子下方找到评分系统。"
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "举报帖子"
 
-#: ../user/forum_report_post.php:81
+#: ../user/forum_report_post.php:84
 msgid ""
 "Why do you find the post offensive: %1Please include enough information so that a person that\n"
 "has not yet read the thread will quickly be able to identify the issue.%2"
 msgstr "为什么你认为这篇帖子是令人不快的:%1请包含足够的说明以便没有阅读过整个主题的人也能快速的判明问题。%2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
 msgstr "举报未记录"
 
-#: ../user/forum_report_post.php:91
+#: ../user/forum_report_post.php:94
 msgid "Your report could not be recorded. Please wait a while and try again."
 msgstr "你的举报未被记录,请等待片刻后重试。"
 
-#: ../user/forum_report_post.php:92
+#: ../user/forum_report_post.php:95
 msgid ""
 "If this is not a temporary error, please report it to the project "
 "developers."
 msgstr "如果该故障无法自动恢复,请向项目开发人员报告。"
 
-#: ../user/forum_rss.php:41
+#: ../user/forum_rss.php:38
 msgid "%1 RSS feed"
 msgstr "%1 RSS 订阅源"
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
 msgstr "留言板的内容更新还可以通过 %sRSS%s 来获取。"
 
-#: ../user/forum_rss.php:43
+#: ../user/forum_rss.php:41
 msgid "Options:"
 msgstr "选项:"
 
-#: ../user/forum_rss.php:47
+#: ../user/forum_rss.php:45
 msgid "Include only posts by user ID %1 (default: all users)."
 msgstr "只包含用户 ID 为 %1 的帖子(默认:所有用户)。"
 
-#: ../user/forum_rss.php:49
+#: ../user/forum_rss.php:47
 msgid "Include only posts from the last %1 days (default: 30)."
 msgstr "只包含最近多少天内的帖子(默认:30)。"
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr "截断帖子:%1(只包含每篇帖子最前面的 256 个字符)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
 msgstr "仅主题:%1(只包含每个主题的第一篇帖子)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
 msgstr "搜索论坛"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "搜索查询"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "搜索关键字:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
 msgstr "包含所有指定字词的帖子将被显示"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
 msgstr "举例:“屏保 死机”"
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "搜索作者ID:"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
 msgstr "仅指定作者的帖子会被显示"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
 msgstr "举例:“43214”"
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "搜索选项"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "搜索限制"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
 msgstr "只搜索最近多少天内的"
 
-#: ../user/forum_search.php:50 ../user/forum_search.php:51
+#: ../user/forum_search.php:52 ../user/forum_search.php:53
 msgid "%1 months"
 msgstr "%1 月"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
 msgstr "一年"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "不限制"
+
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
 msgstr "只显示指定论坛的帖子"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
 msgstr "排序"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
 msgstr "开始搜索"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
 msgstr "论坛搜索结果"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
 msgstr "符合你的查询条件的主题:"
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
 msgstr "符合你的查询条件的消息:"
 
-#: ../user/forum_search_action.php:217
+#: ../user/forum_search_action.php:219
 msgid ""
 "Sorry, couldn't find anything matching your search query. You can try to "
 "broaden your search by using less words (or less specific words)."
 msgstr "对不起,无法根据你的查询条件找到任何结果。你可以试着将查询条件放宽,比如使用更少的关键字词或者更宽泛的字词。"
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
 msgstr "你也可以%1用 Google 进行同样的搜索。%2"
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
 msgstr "重新搜索"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
 msgstr "订阅成功"
 
-#: ../user/forum_subscribe.php:49
+#: ../user/forum_subscribe.php:51
 msgid ""
 "You are now subscribed to %1. You will be notified whenever there is a new "
 "post."
 msgstr "你已经订阅到主题 %1,一旦该主题有更新,你将得到通知。"
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
 msgstr "订阅失败"
 
-#: ../user/forum_subscribe.php:52
+#: ../user/forum_subscribe.php:54
 msgid ""
 "We are currently unable to subscribe you to %1. Please try again later.."
 msgstr "我们当前无法添加你对 %1 的订阅,请稍后再试..."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
 msgstr "退订成功"
 
-#: ../user/forum_subscribe.php:64
+#: ../user/forum_subscribe.php:66
 msgid ""
 "You are no longer subscribed to %1. You will no longer receive notifications"
 " for this thread."
 msgstr "你已经退订了主题 %1,你将不会再收到该主题的通知。"
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
 msgstr "退订失败"
 
-#: ../user/forum_subscribe.php:67
+#: ../user/forum_subscribe.php:69
 msgid ""
 "We are currently unable to unsubscribe you from %1. Please try again later.."
 msgstr "我们当前无法解除你对 %1 的订阅,请稍后再试..."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
 msgstr "未知的订阅操作"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
 msgstr "你不能查看本论坛。"
 
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
 msgstr "该主题已被管理员隐藏"
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
 msgstr "我的问题已得到解答"
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
 msgstr "如果你的问题已经得到充分的解答,请点击这里"
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
 msgstr "我也有同样的问题"
 
-#: ../user/forum_thread.php:159 ../user/forum_thread.php:275
+#: ../user/forum_thread.php:160 ../user/forum_thread.php:285
 msgid "Add a new message to this thread"
 msgstr "回复本主题"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "退订该主题"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
 msgstr "你已经订阅了本主题。点击这里取消订阅。"
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
 msgstr "订阅该主题"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
 msgstr "如果你需要在本主题中有新的回帖时通过电子邮件通知你请点击。"
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
 msgstr "取消隐藏本主题"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
 msgstr "隐藏本主题"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
 msgstr "取消置顶"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
 msgstr "取消本主题的置顶"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
 msgstr "置顶"
 
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr "将本主题置顶显示"
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "使得这个帖子总是在论坛的顶端显示"
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
-msgstr "打开"
+msgstr "解锁"
 
-#: ../user/forum_thread.php:216
-msgid "Unlock this thread"
-msgstr "打开本主题"
+#: ../user/forum_thread.php:217
+msgid "Allow new posts in this thread"
+msgstr "允许在本贴中发表新的跟帖"
 
-#: ../user/forum_thread.php:221
+#: ../user/forum_thread.php:222
 msgid "Lock"
-msgstr "关闭"
+msgstr "锁定"
 
-#: ../user/forum_thread.php:222
-msgid "Lock this thread"
-msgstr "关闭本主题"
+#: ../user/forum_thread.php:223
+msgid "Don't allow new posts in this thread"
+msgstr "禁止在本贴中发表新的跟帖"
 
-#: ../user/forum_thread.php:229
+#: ../user/forum_thread.php:230
 msgid "Move this thread to a different forum"
 msgstr "移动本主题到其它论坛"
 
-#: ../user/forum_thread.php:234
+#: ../user/forum_thread.php:235
 msgid "Edit title"
 msgstr "编辑标题"
 
-#: ../user/forum_thread.php:235
+#: ../user/forum_thread.php:236
 msgid "Edit thread title"
 msgstr "编辑主题的标题"
 
-#: ../user/forum_thread.php:245
+#: ../user/forum_thread.php:244
+msgid "Delete thread permanently"
+msgstr "彻底删除主题"
+
+#: ../user/forum_thread.php:254
 msgid "Export as Notice"
 msgstr "导出为通知"
 
-#: ../user/forum_thread.php:251
+#: ../user/forum_thread.php:260
 msgid "Don't export"
 msgstr "不要导出"
 
-#: ../user/forum_thread.php:252
+#: ../user/forum_thread.php:261
 msgid "Don't export this news item as a Notice"
 msgstr "不要将该新闻条目导出为通知"
 
-#: ../user/forum_thread.php:260 ../user/forum_thread.php:262
+#: ../user/forum_thread.php:270 ../user/forum_thread.php:272
 msgid "Sort"
 msgstr "排序"
 
-#: ../user/forum_thread_status.php:49
+#: ../user/forum_thread_status.php:54
 msgid "Thread status updated"
 msgstr "主题状态已更新"
 
-#: ../user/forum_thread_status.php:50
+#: ../user/forum_thread_status.php:55
 msgid "The status has been updated."
 msgstr "状态已更新。"
 
-#: ../user/forum_user_posts.php:73
+#: ../user/forum_user_posts.php:75
 msgid "Posts by %1"
 msgstr "%1 的帖子"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
 msgstr "已经是好友"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
 msgstr "你已经给 %1 发送过好友请求(%2)。"
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
 msgstr "该请求仍在等待对方确认。"
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
 msgstr "%1 没有接受你的好友请求"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
 msgstr "你不能加自己为好友"
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
 msgstr "添加好友"
 
-#: ../user/friend.php:74
+#: ../user/friend.php:76
 msgid ""
 "You have asked to add %1 as a friend. We will notify %1 and will ask him/her"
 " to confirm that you are friends."
 msgstr "你已经要求将 %1 加为好友,我们将通知 %1 并请他/她来确认你们的关系。"
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
 msgstr "可以在这里添加一条附加消息:"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
 msgstr "好友请求已发送"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
 msgstr "我们已经把你的好友请求通知给了 %1。"
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr "请以 %1 的身份登录"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr "你必须以 %1 的身份登录才能查看该好友请求"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
 msgstr "好友请求"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
 msgstr "%1 给你发送了好友请求。"
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr "%1 还说:%2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
 msgstr "接受好友请求"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
 msgstr "如果 %1 是你的好友请点击接受"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
 msgstr "如果 %1 不是你的好友请点击拒绝"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
 msgstr "好友请求已确认"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
 msgstr "你与 %1 的好友关系已经被确认。"
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
 msgstr "好友请求被拒绝"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
 msgstr "你已经拒绝了与 %1 的好友关系"
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
 msgstr "无法找到通知"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
 msgstr "好友已确认"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
 msgstr "你现在和 %1 是好友了。"
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
 msgstr "删除好友"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
 msgstr "你确定想要取消与 %1 的好友关系吗?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
 msgstr "保持好友关系"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
 msgstr "好友关系已取消"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
 msgstr "你与 %1 的好友关系已经取消。"
 
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr "忘记了你的账户信息?"
-
-#: ../user/get_passwd.php:28
+#: ../user/get_passwd.php:27
 msgid ""
 "1) If you know your account's email address, and you can receive email "
 "there:"
 msgstr "1) 如果你知道你账户关联的电子邮箱地址,你可以在那里收到电子邮件:"
 
-#: ../user/get_passwd.php:29
+#: ../user/get_passwd.php:28
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
@@ -4417,15 +4454,24 @@ msgstr "你现在将登录进自己的账户,可以更新你的电子邮箱地
 msgid "Log in with authenticator"
 msgstr "用身份验证码(authenticator)来登录"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "忘记了你的账户信息?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
 msgstr "还没有已上报的 GPU 计算任务"
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "GPU 型号排名"
+
+#: ../user/gpu_list.php:207
 msgid ""
 "The following lists show the most productive GPU models on different "
-"platforms.  Relative speeds are shown in parentheses."
-msgstr "下面的列表显示了各个平台上效率最好的 GPU 型号,不同型号间的速度差异用百分比来表示。"
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "下面的列表显示了各个平台上效率最好的 GPU 型号,这些速度由任务平均完成时间计算得到,不同型号间的速度差异用百分比来表示。"
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4439,6 +4485,10 @@ msgstr "使用下面的链接查看及编辑你的帐户参数"
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "如果还没有的话,%1下载 BOINC 的客户端软件%2。"
 
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "你的帐户"
+
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
 msgstr "匿名平台,未知应用"
@@ -4553,10 +4603,14 @@ msgstr "无主机名"
 msgid "Merge hosts"
 msgstr "合并主机"
 
-#: ../user/host_update_credit.php:28
+#: ../user/host_update_credit.php:27
 msgid "Updating computer credit"
 msgstr "正在更新计算机积分"
 
+#: ../user/host_update_credit.php:37
+msgid "Host credit updated"
+msgstr "主机积分已更新"
+
 #: ../user/host_venue_action.php:41
 msgid "Host venue updated"
 msgstr "主机位置已更新"
@@ -4638,6 +4692,10 @@ msgstr "图片,高度不能超出 450 像素,请不要在未经允许的情
 msgid "You can also use ampersand notation for special characters."
 msgstr "你也可以使用 &(和号)开头的字符实体来表示特殊字符(比如   等)。"
 
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "阅读规定和政策"
+
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
 msgstr "仅在已授权的计算机上运行 %1"
@@ -4811,27 +4869,7 @@ msgid ""
 "%1you can provide a translation%2."
 msgstr "翻译工作都是由志愿者完成的,如果这里没有你的母语,%1你可以自己进行翻译%2。"
 
-#: ../user/login_form.php:45
-msgid "Email address:"
-msgstr "电子邮件地址:"
-
-#: ../user/login_form.php:45
-msgid "forgot email address?"
-msgstr "忘记了电子邮箱地址?"
-
-#: ../user/login_form.php:48
-msgid "Password:"
-msgstr "用户口令:"
-
-#: ../user/login_form.php:48
-msgid "forgot password?"
-msgstr "忘记了口令?"
-
-#: ../user/login_form.php:51
-msgid "Stay logged in"
-msgstr "保持登录状态"
-
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "或者%1创建一个新帐户%2。"
 
@@ -4955,244 +4993,248 @@ msgstr "你目前没有私人消息。"
 msgid "Sender and date"
 msgstr "发送人及日期"
 
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "回复该消息"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "删除该消息"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
 msgstr "全选"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
 msgstr "取消全选"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
 msgstr "删除选中的消息"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
 msgstr "发送人"
 
-#: ../user/pm.php:143
+#: ../user/pm.php:148
 msgid "Date"
 msgstr "日期"
 
-#: ../user/pm.php:185
+#: ../user/pm.php:190
 msgid "You need to fill all fields to send a private message"
 msgstr "要发送私人消息,你必须填写所有字段"
 
-#: ../user/pm.php:188
+#: ../user/pm.php:193
 msgid ""
 "Your message was flagged as spam\n"
 "                by the Akismet anti-spam system.\n"
 "                Please modify your text and try again."
 msgstr "你的消息已被 Akismet 防垃圾信息系统\n标记为垃圾信息,请修改你输入的内容并重试。"
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr "无法找到用户ID为 %1 的用户"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr "无法找到用户名为 %1 的用户"
 
-#: ../user/pm.php:212
+#: ../user/pm.php:217
 msgid "%1 is not a unique username; you will have to use user ID"
 msgstr "因为 %1 不是唯一的用户名,你将只能使用用户ID"
 
-#: ../user/pm.php:217
+#: ../user/pm.php:222
 msgid "User %1 (ID: %2) is not accepting private messages from you."
 msgstr "用户 %1(ID 为 %2)已禁止接受你的私人消息。"
 
-#: ../user/pm.php:240 ../user/view_profile.php:26
+#: ../user/pm.php:245 ../user/view_profile.php:28
 msgid "No such user"
 msgstr "没有这个用户"
 
-#: ../user/pm.php:242
+#: ../user/pm.php:247
 msgid "Really block %1?"
 msgstr "确定要阻止 %1 吗?"
 
-#: ../user/pm.php:243
+#: ../user/pm.php:248
 msgid ""
 "Are you really sure you want to block user %1 from sending you private "
 "messages?"
 msgstr "你确定要阻止用户 %1 向你发送私人消息吗?"
 
-#: ../user/pm.php:244
+#: ../user/pm.php:249
 msgid "Please note that you can only block a limited amount of users."
 msgstr "请注意你只有阻止有限数量的用户。"
 
-#: ../user/pm.php:245
+#: ../user/pm.php:250
 msgid ""
 "Once the user has been blocked you can unblock it using forum preferences "
 "page."
 msgstr "一旦该用户被你阻止,你可以在论坛的参数设置页面中解除该阻止。"
 
-#: ../user/pm.php:252
+#: ../user/pm.php:257
 msgid "No, cancel"
 msgstr "不,取消"
 
-#: ../user/pm.php:260 ../user/team_admins.php:98
+#: ../user/pm.php:265 ../user/team_admins.php:100
 msgid "no such user"
 msgstr "没有这个用户"
 
-#: ../user/pm.php:263
+#: ../user/pm.php:268
 msgid "User %1 blocked"
 msgstr "用户 %1 已被阻止"
 
-#: ../user/pm.php:265
+#: ../user/pm.php:270
 msgid "User %1 has been blocked from sending you private messages."
 msgstr "用户 %1 已被阻止向你发送私人消息。"
 
-#: ../user/pm.php:266
+#: ../user/pm.php:271
 msgid "To unblock, visit %1message board preferences%2"
 msgstr "要解除阻止,请访问 %1留言板的参数设置%2"
 
-#: ../user/pm.php:302
+#: ../user/pm.php:307
 msgid "Unknown action"
 msgstr "未知的操作"
 
-#: ../user/prefs.php:32
+#: ../user/prefs.php:33
 msgid ""
 "Your preferences have been updated, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "你的参数设置已经更新\n\t      将在你的计算机与%1进行通讯的时候生效\n\t      或者你也可以直接执行 BOINC 客户端里的%2更新%3命令。"
 
-#: ../user/prefs.php:41
+#: ../user/prefs.php:42
 msgid ""
 "Your preferences have been reset to the defaults, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "你的偏好设置已经复位为缺省值\n这将在您的计算机与%1通信时生效\n或者你可以直接使用BOINC客户端的%2更新%3命令。"
 
-#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+#: ../user/prefs_edit.php:66 ../user/prefs_edit.php:94
 msgid "%1 for %2"
 msgstr "%1(用于%2)"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
 msgstr "返回参数设置"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
 msgstr "确认删除参数设置"
 
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:49
 msgid "Are you sure you want to delete your separate %1 preferences for %2?"
 msgstr "你确定要删除%1参数设置(用于%2)吗?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
 msgstr "移除参数设置"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
 msgstr "取消"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "用户档案"
+
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
 msgstr "通过 %1用户档案%2 志愿者可以和 %3 社区分享他的背景和观点。"
 
-#: ../user/profile_menu.php:36
+#: ../user/profile_menu.php:38
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
 msgstr "可以了解其他志愿者的想法,也可以让他人看到你分享的观点。"
 
-#: ../user/profile_menu.php:37
+#: ../user/profile_menu.php:39
 msgid ""
 "If you haven't already, you can %1create your own user profile%2 for others "
 "to see!"
 msgstr "如果你还没有用户档案的话,你现在就可以%1创建属于你自己的用户档案了%2!"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
 msgstr "每日用户"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
 msgstr "使用用户档案浏览器"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
 msgstr "查看%1用户图片库%2。"
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr "%1按国家或地区%2浏览用户档案。"
 
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:64
 msgid ""
 "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
 "without pictures%2."
 msgstr "%1随机地浏览所有用户档案%2,%3随机地浏览带图片的用户档案%2,或者%4随机地浏览不带图片%2的用户档案。"
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
 msgstr "按字母表顺序的用户档案列表:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
 msgstr "搜索用户档案文本"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
 msgstr "没有用户档案"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
 msgstr "没有用户档案符合你的查询条件。"
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
 msgstr "错误的投票类型:"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
 msgstr "投票已记录"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
 msgstr "非常感谢"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
 msgstr "你的推荐已经被记录下来。"
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
 msgstr "你对该用户档案的反感已经被记录下来。"
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
 msgstr "返回用户档案。"
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
 msgstr "包含'%1'的个人档案"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
 msgstr "用户名称"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
 msgstr "加入的项目"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "近期平均积分"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
 msgstr "没有找到包含'%1'的个人档案"
 
@@ -5220,149 +5262,61 @@ msgstr "用户 ID 或 主机 ID 丢失"
 msgid "No tasks to display"
 msgstr "没有任务可以显示"
 
-#: ../user/server_status.php:97
-msgid "Running"
-msgstr "运行中"
+#: ../user/sample_index.php:195
+msgid "User of the day"
+msgstr "今日用户"
 
-#: ../user/server_status.php:100
+#: ../user/server_status.php:59
 msgid "Not Running"
 msgstr "未运行"
 
-#: ../user/server_status.php:103
+#: ../user/server_status.php:63
+msgid "Running"
+msgstr "运行中"
+
+#: ../user/server_status.php:67
 msgid "Disabled"
 msgstr "已禁用"
 
-#: ../user/server_status.php:231
+#: ../user/server_status.php:105
 msgid "Project status"
 msgstr "项目状态"
 
-#: ../user/server_status.php:233
-msgid "Server software version: %1"
-msgstr "服务端软件版本:%1"
+#: ../user/server_status.php:110
+msgid "Server status"
+msgstr "服务器状态"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Program"
 msgstr "程序"
 
-#: ../user/server_status.php:241
+#: ../user/server_status.php:113
 msgid "Host"
 msgstr "主机"
 
-#: ../user/server_status.php:252
-msgid "data-driven web pages"
-msgstr "数据驱动的网页"
-
-#: ../user/server_status.php:258
-msgid "upload/download server"
-msgstr "上传/下载服务器"
+#: ../user/server_status.php:125
+msgid "Database schema version: "
+msgstr "数据库架构版本:"
 
-#: ../user/server_status.php:261
-msgid "scheduler"
-msgstr "调度程序"
-
-#: ../user/server_status.php:294
-msgid "Running:"
-msgstr "运行中:"
-
-#: ../user/server_status.php:295
-msgid "Program is operating normally"
-msgstr "程序当前运行正常"
-
-#: ../user/server_status.php:296
-msgid "Not Running:"
-msgstr "未运行:"
-
-#: ../user/server_status.php:297
-msgid "Program failed or the project is down"
-msgstr "程序出错或者项目已停机"
-
-#: ../user/server_status.php:298
-msgid "Disabled:"
-msgstr "已禁用:"
-
-#: ../user/server_status.php:299
-msgid "Program is disabled"
-msgstr "程序已禁用"
-
-#: ../user/server_status.php:303
+#: ../user/server_status.php:134
 msgid "Computing status"
 msgstr "计算状态"
 
-#: ../user/server_status.php:309
-msgid "The database server is not accessible"
-msgstr "数据库服务器当前无法访问"
-
-#: ../user/server_status.php:326
-msgid "Tasks ready to send"
-msgstr "准备分发的任务"
-
-#: ../user/server_status.php:331 ../user/workunit.php:55
-msgid "Tasks in progress"
-msgstr "任务处理中"
-
-#: ../user/server_status.php:336
-msgid "Workunits waiting for validation"
-msgstr "等待验证的任务"
-
-#: ../user/server_status.php:341
-msgid "Workunits waiting for assimilation"
-msgstr "等待回收的任务"
-
-#: ../user/server_status.php:346
-msgid "Workunits waiting for file deletion"
-msgstr "等待删除的任务"
-
-#: ../user/server_status.php:351
-msgid "Tasks waiting for file deletion"
-msgstr "等待删除的任务"
-
-#: ../user/server_status.php:367
-msgid "Transitioner backlog (hours)"
-msgstr "服务端事务积压(小时)"
-
-#: ../user/server_status.php:374
+#: ../user/server_status.php:149
 msgid "Users"
 msgstr "用户"
 
-#: ../user/server_status.php:377 ../user/server_status.php:395
-msgid "with recent credit"
-msgstr "近期得到过积分的"
-
-#: ../user/server_status.php:382 ../user/server_status.php:400
-msgid "with credit"
-msgstr "得到过积分的"
-
-#: ../user/server_status.php:387 ../user/server_status.php:405
-msgid "registered in past 24 hours"
-msgstr "过去 24 小时内注册的"
-
-#: ../user/server_status.php:411
-msgid "current GigaFLOPs"
-msgstr "当前处理能力(GFLOPs)"
-
-#: ../user/server_status.php:420
+#: ../user/server_status.php:161
 msgid "Tasks by application"
 msgstr "按计算程序分类的任务"
 
-#: ../user/server_status.php:423 ../user/workunit.php:40
-msgid "application"
-msgstr "计算程序"
-
-#: ../user/server_status.php:424
-msgid "unsent"
-msgstr "未发送的"
-
-#: ../user/server_status.php:425
-msgid "in progress"
-msgstr "计算中"
-
-#: ../user/server_status.php:426
-msgid "avg runtime of last 100 results in h (min-max)"
-msgstr "最近 100 个计算结果的平均处理时间(单位:小时)"
+#: ../user/server_status.php:164
+msgid "Runtime of last 100 tasks in hours: average, min, max"
+msgstr "最后 100 项任务的运行时间(以小时为单位): 平均时间,最短时间,最长时间"
 
-#: ../user/server_status.php:427
-msgid "users in last 24h"
-msgstr "最近 24 小时的用户"
+#: ../user/server_status.php:165
+msgid "Users in last 24 hours"
+msgstr "在过去的 24 小时中的用户"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5372,679 +5326,701 @@ msgstr "计算机 %1"
 msgid "Statistics and leaderboards"
 msgstr "统计信息和排行榜"
 
-#: ../user/stats.php:28
+#: ../user/stats.php:30
 msgid "Statistics for %1"
 msgstr "%1 的统计信息"
 
-#: ../user/stats.php:37
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "用户排名"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "团队排名"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "主机排名"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "GPU 型号"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "CPU 型号"
+
+#: ../user/stats.php:53
 msgid ""
 "More detailed statistics for %1 and other BOINC-based projects are available"
 " at several web sites:"
 msgstr "下列几个网站可以查询到关于 %1 和其它 BOINC 项目的更详细的统计信息:"
 
-#: ../user/stats.php:40
+#: ../user/stats.php:56
 msgid ""
 "You can also get your current statistics in the form of a \"signature "
 "image\":"
 msgstr "你还可以通过“签名图片”的形式得到你当前的统计信息:"
 
-#: ../user/stats.php:43
+#: ../user/stats.php:59
 msgid ""
 "Additionally you can get your individual statistics summed across all BOINC "
 "projects from several sites; see your %1home page%2."
 msgstr "另外,你还可以在你的 %1帐户主页面%2 中查看所有你参加的 BOINC 项目中的个人统计信息。"
 
 #: ../user/team.php:27
+msgid "Teams"
+msgstr "团队"
+
+#: ../user/team.php:29
 msgid "%1 participants may form %2teams%3."
 msgstr "%1 的用户可以组成 %2团队%3"
 
-#: ../user/team.php:29
+#: ../user/team.php:31
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
 msgstr "你最多只能加入一个团队。你可以在任何时候加入或退出一个团队。"
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
 msgstr "每个团队都有一个 %1创建人%2,他可以:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
 msgstr "访问团队成员的电子邮件地址"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
 msgstr "编辑团队的名称及描述"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
 msgstr "增加或移除团队管理员"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
 msgstr "移除团队中的成员"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
 msgstr "解散没有成员的团队"
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
 msgstr "要加入一个团队,请访问该团队的页面并点击 %1加入该团队%2。"
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
 msgstr "寻找团队"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
 msgstr "所有团队"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
 msgstr "%1 团队"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
 msgstr "创建新团队"
 
-#: ../user/team.php:59
+#: ../user/team.php:61
 msgid ""
 "If you cannot find a team that is right for you, you can %1create a team%2."
 msgstr "如果你找不到适合你的团队,你可以 %1创建一个团队%2。"
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
 msgstr "从该成员移除团队管理员状态"
 
-#: ../user/team_admins.php:40 ../user/team_admins.php:51
+#: ../user/team_admins.php:42 ../user/team_admins.php:53
 msgid "Add or remove Team Admins"
 msgstr "增加或移除团队管理员"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
 msgstr "你可以将部分团队成员设置为“团队管理员”,团队管理员可以:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "编辑团队信息(名称,网址,描述,国家地区)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
 msgstr "查看团队的成员加入退出历史"
 
-#: ../user/team_admins.php:45
+#: ../user/team_admins.php:47
 msgid ""
 "Moderate the team forum, if any (admins get email notification of moderation"
 " events and red X reports)"
 msgstr "管理团队论坛(团队管理员会得到管理事件和报告的电子邮件通知)"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
 msgstr "团队管理员不可以:"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
 msgstr "改变团队创建人"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
 msgstr "移除团队成员"
 
-#: ../user/team_admins.php:53
+#: ../user/team_admins.php:55
 msgid "If a Team Admin quits the team, they cease to be a Team Admin."
 msgstr "如果团队管理员退出团队,其团队管理员的角色同时取消。"
 
-#: ../user/team_admins.php:54
+#: ../user/team_admins.php:56
 msgid ""
 "We recommend that you select only people you know and trust very well as "
 "Team Admins."
 msgstr "我们建议你只选择自己了解或信任的成员作为团队管理员。"
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
 msgstr "目前没有团队管理员"
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
 msgstr "当前的团队管理员"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
 msgstr "成为团队管理员"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
 msgstr "增加团队管理员"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
 msgstr "团队成员的电子邮箱地址:"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "增加"
+
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
 msgstr "移除管理员时出错"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
 msgstr "用户不是团队成员"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
 msgstr "%1 已经是 %2 的管理员"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
 msgstr "不能增加管理员"
 
-#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
+#: ../user/team_admins.php:113 ../user/team_manage.php:85
+#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:30
 msgid "No such team"
 msgstr "没有匹配的团队"
 
-#: ../user/team_change_founder_action.php:30
-#: ../user/team_change_founder_form.php:33 ../user/team_display.php:67
-#: ../user/team_edit_action.php:30 ../user/team_edit_form.php:29
-#: ../user/team_email_list.php:55
+#: ../user/team_change_founder_action.php:32
+#: ../user/team_change_founder_form.php:35 ../user/team_display.php:69
+#: ../user/team_edit_action.php:32 ../user/team_edit_form.php:31
+#: ../user/team_email_list.php:64
 msgid "no such team"
 msgstr "没有匹配的团队"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
 msgstr "用户不是 %1 的成员"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr "正在改变 %1 的创建人"
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
 msgstr "%1 现在是 %2 的创建人了"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr "改变 %1 的创建人"
 
-#: ../user/team_change_founder_form.php:43
+#: ../user/team_change_founder_form.php:45
 msgid ""
 "Team member %1 requested this team's foundership on %2, but left the team, "
 "thus canceling the request."
 msgstr "团队成员 %1 在请求 %2 的创建人资格之后退出了团队,请求自动取消。"
 
-#: ../user/team_change_founder_form.php:49
+#: ../user/team_change_founder_form.php:51
 msgid ""
 "Team member %1 has requested this team's foundership. This may be because "
 "you left the team or haven't had contact with the team for a long time."
 msgstr "团队成员 %1 请求了这个团队的创建人资格,这可能是因为你离开过团队或者有较长时间没有和团队联系。"
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
 msgstr "拒绝请求"
 
-#: ../user/team_change_founder_form.php:58
+#: ../user/team_change_founder_form.php:60
 msgid ""
 "If you don't decline the request by %1, %2 will have the option of assuming team foundership.<br /><br />\n"
 "                  To accept the request, assign foundership to %3 using the form below."
 msgstr "如果你不拒绝 %1 的请求,%2 将可以得到团队创建人的资格。<br /><br />\n                  如果要接受请求,并将创建人资格授予 %3,请使用下面的表单。"
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
 msgstr "目前没有等待处理的团队创建人转换请求。"
 
-#: ../user/team_change_founder_form.php:69
+#: ../user/team_change_founder_form.php:71
 msgid ""
 "To assign foundership of this team to another member, check the box next to "
 "member name and click <strong>Change founder</strong> below."
 msgstr "要将团队的创建人资格授予另一位成员,请先选中成员名旁边的选择框,然后点击下面的<strong>更改创建人</strong>。"
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
 msgstr "新的团队创建人?"
 
-#: ../user/team_change_founder_form.php:105 ../user/team_manage.php:56
+#: ../user/team_change_founder_form.php:107 ../user/team_manage.php:58
 msgid "Change founder"
 msgstr "更改团队创建人"
 
-#: ../user/team_change_founder_form.php:108
+#: ../user/team_change_founder_form.php:110
 msgid "There are no users to transfer team to."
 msgstr "目前没有用户更换了团队。"
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
 msgstr "你必须选择一个非空的团队名称"
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
 msgstr "名为 %1 的团队已经存在 - 请尝试其它的名称"
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
 msgstr "无法创建团队 - 请稍后再试。"
 
-#: ../user/team_create_form.php:27 ../user/team_create_form.php:32
+#: ../user/team_create_form.php:29 ../user/team_create_form.php:34
 msgid "Create a team"
 msgstr "创建一个团队"
 
-#: ../user/team_create_form.php:30
+#: ../user/team_create_form.php:32
 msgid ""
 "You belong to %1. You must %2quit this team%3 before creating a new one."
 msgstr "你当前加入了 %1,你在创建新团队之前必须先 %2退出这个团队%3。"
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
 msgstr "没有创建人或团队管理员"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
 msgstr "%1 的团队历史"
 
-#: ../user/team_delta.php:75
+#: ../user/team_delta.php:76
 msgid "When"
 msgstr "时间"
 
-#: ../user/team_delta.php:76
+#: ../user/team_delta.php:77
 msgid "User"
 msgstr "用户"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
 msgstr "行为"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
 msgstr "当时的总积分"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
 msgstr "国家地区信息错误"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
 msgstr "名称“%1”已经被其它团队使用。"
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
 msgstr "必须指定团队名称"
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
 msgstr "无法更新团队 - 请稍后再试。"
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
 msgstr "编辑 %1"
 
-#: ../user/team_edit_form.php:34
+#: ../user/team_edit_form.php:36
 msgid "Update team info"
 msgstr "更新团队信息"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
 msgstr "%1 邮件列表"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr "%1 的成员列表"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
 msgstr "显示为纯文本"
 
-#: ../user/team_forum.php:28 ../user/team_forum.php:39
+#: ../user/team_forum.php:30 ../user/team_forum.php:41
 msgid "Create Message Board"
 msgstr "创建留言板"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
 msgstr "你可以创建一个仅供 %1 使用的留言板。"
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
 msgstr "只有团队成员可以发贴。"
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
 msgstr "还可以设置是否只允许团队成员进行阅读。"
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
 msgstr "你和你的团队管理员拥有管理权限。"
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "创建一个 %1 的留言板"
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
 msgstr "团队已经拥有留言板了"
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
 msgstr "团队留言板"
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
 msgstr "最小发贴间隔(秒)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "发贴要求的最低总积分"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "发贴要求的最低平均积分"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
 msgstr "提交"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
 msgstr "移除团队的留言板"
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
 msgstr "确定要移除留言板吗?"
 
-#: ../user/team_forum.php:98
+#: ../user/team_forum.php:100
 msgid ""
 "Are you sure you want to remove your team's message board? All threads and "
 "posts will be permanently removed. (You may, however, create a new message "
 "board later)."
 msgstr "你确定要移除你所在团队的留言板吗?所有的主题和回帖将永久被删除。(当然,你随后还可以重新创建一个新的留言板。)"
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
 msgstr "是的 - 请移除留言板"
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
 msgstr "留言板已被移除"
 
-#: ../user/team_forum.php:124
+#: ../user/team_forum.php:126
 msgid ""
 "Your team's message board has been removed. You may now %1create a new "
 "one%2."
 msgstr "你的团队留言板已被移除,你现在可以%1创建一个新的留言板%2。"
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
 msgstr "团队留言板已更新"
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
 msgstr "更新成功"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
 msgstr "更新失败"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "团队没有论坛"
 
-#: ../user/team_founder_transfer_action.php:36
+#: ../user/team_founder_transfer_action.php:38
 msgid "You must be a member of a team to access this page."
 msgstr "只有团队的成员可以访问该页面。"
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
 msgstr "正在请求 %1 的创建人资格"
 
-#: ../user/team_founder_transfer_action.php:98
+#: ../user/team_founder_transfer_action.php:100
 msgid ""
 "The current founder has been notified of your request by email and private message.<br /><br />\n"
 "                       If the founder does not respond within 60 days you will be allowed to become the founder."
 msgstr "你的请求已经通过电子邮件和私人消息通知到了当前的创建人。<br /><br />\n                       如果该创建人在 60 天没有回应,你就可以成为创建人了。"
 
-#: ../user/team_founder_transfer_action.php:102
-#: ../user/team_founder_transfer_action.php:113
+#: ../user/team_founder_transfer_action.php:104
+#: ../user/team_founder_transfer_action.php:115
 msgid "Foundership request not allowed now"
 msgstr "现在不允许请求创建人资格"
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
 msgstr "得到 %1 的创建人资格"
 
-#: ../user/team_founder_transfer_action.php:111
+#: ../user/team_founder_transfer_action.php:113
 msgid ""
 "Congratulations, you are now the founder of team %1. Go to %2Your Account "
 "page%3 to find the Team Admin options."
 msgstr "恭喜,你已经是 %1 的创建人了!请在%2你的帐户页面%3使用团队管理功能。"
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
 msgstr "拒绝创建人更改请求"
 
-#: ../user/team_founder_transfer_action.php:127
+#: ../user/team_founder_transfer_action.php:129
 msgid "The foundership request from %1 has been declined."
 msgstr "来自 %1 的创建人请求已经被拒绝。"
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
 msgstr "目前没有创建人请求。"
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
 msgstr "未定义行为 %1"
 
-#: ../user/team_founder_transfer_action.php:137
-#: ../user/team_founder_transfer_form.php:83
+#: ../user/team_founder_transfer_action.php:139
+#: ../user/team_founder_transfer_form.php:85
 msgid "Return to team page"
 msgstr "返回团队页面"
 
-#: ../user/team_founder_transfer_form.php:28
+#: ../user/team_founder_transfer_form.php:30
 msgid "You need to be a member of a team to access this page."
 msgstr "只有团队的成员可以访问该页面。"
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
 msgstr "请求 %1 的创建人资格"
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
 msgstr "你已经是 %1 的创建人。"
 
-#: ../user/team_founder_transfer_form.php:44
+#: ../user/team_founder_transfer_form.php:46
 msgid "You requested the foundership of %1 on %2."
 msgstr "你已经请求了 %1 的创建人资格(时间:%2)。"
 
-#: ../user/team_founder_transfer_form.php:47
+#: ../user/team_founder_transfer_form.php:49
 msgid ""
 "60 days have elapsed since your request, and the founder has not responded. "
 "You may now assume foundership by clicking here:"
 msgstr "原创建人在 60 天内都没有回应你的请求,你现在可以点击这里来得到创建人资格:"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
 msgstr "得到创建人资格"
 
-#: ../user/team_founder_transfer_form.php:54
+#: ../user/team_founder_transfer_form.php:56
 msgid ""
 "The founder was notified of your request. If he/she does not respond by %1 "
 "you will be given an option to become founder."
 msgstr "你的请求已经通知到了创建人,如果他/她到 %1 都没有回应的话,你将可以选择成为新的创建人。"
 
-#: ../user/team_founder_transfer_form.php:60
+#: ../user/team_founder_transfer_form.php:62
 msgid ""
 "If the team founder is not active and you want to assume the role of founder, click the button below. The current founder will be sent an email detailing your request, and will be able to transfer foundership to you or to decline your request. If the founder does not respond in 60 days, you will be allowed to become the founder.<br /><br />\n"
 "                       Are you sure you want to request foundership?"
 msgstr "如果你将得到团队创建人的资格(因为当前的创建人不活跃等原因),请点击下面的按钮。你的请求将通过电子邮件通知到当前的创建人,他/她可以将创建人资格转移给你或者拒绝你的请求。如果他/她在 60 天内都没有回应,你就可以得到创建人的资格。<br /><br />\n                      你确定想要请求创建人资格吗?"
 
-#: ../user/team_founder_transfer_form.php:65
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
 msgstr "请求创建人资格"
 
-#: ../user/team_founder_transfer_form.php:74
+#: ../user/team_founder_transfer_form.php:76
 msgid "Founder change has already been requested by %1 on %2."
 msgstr "%1 已经在 %2 请求了创建人更改。"
 
-#: ../user/team_founder_transfer_form.php:77
+#: ../user/team_founder_transfer_form.php:79
 msgid ""
 "A foundership change was requested during the last 90 days, so new requests "
 "are not allowed. Please try again later."
 msgstr "因为过去 90 天已经有过程创建人资格更改请求,目前不允许发起新的请求,请稍后再试。"
 
-#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
+#: ../user/team_join.php:34 ../user/team_join_action.php:34
+#: ../user/team_join_form.php:31
 msgid "The team %1 is not joinable."
 msgstr "团队 %1 不允许加入。"
 
-#: ../user/team_join.php:35 ../user/team_join_action.php:35
+#: ../user/team_join.php:37 ../user/team_join_action.php:37
 msgid "Already a member"
 msgstr "已经是团队成员"
 
-#: ../user/team_join.php:36 ../user/team_join_action.php:36
+#: ../user/team_join.php:38 ../user/team_join_action.php:38
 msgid "You are already a member of %1."
 msgstr "你已经是 %1 的成员了。"
 
-#: ../user/team_join.php:42 ../user/team_join_action.php:43
+#: ../user/team_join.php:44 ../user/team_join_action.php:45
 msgid "Couldn't join team - please try again later."
 msgstr "无法加入团队 - 请稍后再试。"
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
 msgstr "已加入 %1"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr "你已经加入了 %1。"
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr "加入 %1"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
 msgstr "请注意:"
 
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:37
 msgid "Joining a team gives its founder access to your email address."
 msgstr "加入团队后,团队的创建人将可以看到你的电子邮箱地址。"
 
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
 msgstr "加入团队对你的帐户积分没有影响。"
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
 msgstr "加入团队"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
 msgstr "“%1”的搜索结果"
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
 msgstr "你可以查看这些团队的成员,统计以及其它信息。"
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
 msgstr "超过 100 个的团队符合你的搜索条件,现在只显示了前 100 个。"
 
-#: ../user/team_lookup.php:104
+#: ../user/team_lookup.php:106
 msgid ""
 "End of results. %1 If you cannot find the team you are looking for, you may "
 "%2create a team%3 yourself."
 msgstr "上面是所有的搜索结果。%1如果没找到合适的团队,你也可以自己%2创建一个团队%3。"
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr "%1 的团队管理"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
 msgstr "编辑团队信息"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
 msgstr "改变团队名称,网址,描述,类型或者国家地区"
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
 msgstr "成员列表:"
 
-#: ../user/team_manage.php:33 ../user/team_manage.php:37
+#: ../user/team_manage.php:35 ../user/team_manage.php:39
 msgid "HTML"
 msgstr "HTML"
 
-#: ../user/team_manage.php:34
+#: ../user/team_manage.php:36
 msgid "text"
 msgstr "文本"
 
-#: ../user/team_manage.php:35
+#: ../user/team_manage.php:37
 msgid "View member names and email addresses"
 msgstr "查看成员名称和电子邮箱地址"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
 msgstr "查看更改历史:"
 
-#: ../user/team_manage.php:38
+#: ../user/team_manage.php:40
 msgid "XML"
 msgstr "XML"
 
-#: ../user/team_manage.php:39
+#: ../user/team_manage.php:41
 msgid "See when members joined or quit this team"
 msgstr "查看成员加入或离开团队的时间"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
 msgstr "回应创建人资格请求。"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
 msgstr "如果你到 %1 都不回应,%2 将可以得到这个团队的创建人资格。"
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
 msgstr "从团队中移除不活跃或不喜欢的成员"
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
 msgstr "将创建人资格转移给其他成员"
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
 msgstr "增加/移除团队管理员"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
 msgstr "将团队管理员权限授予选中的团队成员"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
 msgstr "移除团队"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
 msgstr "只能在团队没有成员的时候进行该操作"
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
 msgstr "创建或管理团队留言板"
 
-#: ../user/team_manage.php:71
+#: ../user/team_manage.php:73
 msgid ""
 "To have this team created on all BOINC projects (current and future) you can"
 " make it into a %1BOINC-wide team%2."
 msgstr "如果想在所有的 BOINC 项目(当前在运行的和以后可能会有的)中都创建这个团队,你可以将它转变为一个%1BOINC-wide 团队%2。"
 
-#: ../user/team_manage.php:73
+#: ../user/team_manage.php:75
 msgid ""
 "Team admins are encouraged to join and participate in the Google %1boinc-"
 "team-founders%2 group."
 msgstr "建议所有团队管理员都加入和参加到 Google 的 %1boinc-team-founders%2 讨论组中。"
 
-#: ../user/team_manage.php:75
-msgid ""
-"Other resources for BOINC team admins are available from a third-party site,"
-" %1www.boincteams.com%2."
-msgstr "BOINC 团队管理员还可以从一个第三方网站得到其它相关资源:%1www.boincteams.com%2。"
-
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
 msgstr "不能删除非空团队"
@@ -6053,27 +6029,27 @@ msgstr "不能删除非空团队"
 msgid "Team %1 deleted"
 msgstr "团队 %1 已删除"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr "超出限制:只能显示前 1000 名成员。"
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
 msgstr "%1 的成员"
 
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
 msgid "Unable to quit team"
 msgstr "不能退出团队"
 
-#: ../user/team_quit_action.php:33
+#: ../user/team_quit_action.php:35
 msgid "Team doesn't exist, or you don't belong to it."
 msgstr "团队不存在,或者你属于该团队。"
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
 msgstr "退出 %1"
 
-#: ../user/team_quit_form.php:32
+#: ../user/team_quit_form.php:34
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
@@ -6082,85 +6058,85 @@ msgid ""
 "         </ul>"
 msgstr "<strong>退出团队前请注意:</strong>\n         <ul>\n         <li>如果你退出一个团队,你还可以重新加入,或者也可以加入其它团队。\n         <li>退出团队无论如何都不会影响你的个人积分。\n         </ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
 msgstr "退出团队"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
 msgstr "从 %1 中移除用户"
 
-#: ../user/team_remove_inactive_action.php:39
+#: ../user/team_remove_inactive_action.php:41
 msgid "%1 is not a member of %2"
 msgstr "%1 不是 %2 的成员"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr "%1 已被移除"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr "从 %1 移除成员"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
 msgstr "移除?"
 
-#: ../user/team_remove_inactive_form.php:40
+#: ../user/team_remove_inactive_form.php:42
 msgid "Name (ID)"
 msgstr "名称(ID)"
 
-#: ../user/team_remove_inactive_form.php:65
+#: ../user/team_remove_inactive_form.php:67
 msgid "No members are eligible for removal."
 msgstr "没有任何成员符合移除的条件。"
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
 msgstr "移除用户"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
 msgstr "团队名称"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
 msgstr "团队搜索结果"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
 msgstr "没有任何团队符合你的查询条件,请试试其它查询条件。"
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
 msgstr "或者你也可以%1创建一个新团队%2。"
 
-#: ../user/team_search.php:100
+#: ../user/team_search.php:121
 msgid ""
 "The following teams match one or more of your search criteria.\n"
 "            To join a team, click its name to go to the team page,\n"
 "               then click %1Join this team%2."
 msgstr "下面的团队符合一个或多个你的查询条件。\n            要加入一个团队,点击名称后即可进入团队页面,\n               然后点击%1加入该团队%2即可。"
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
 msgstr "修改你的搜索条件"
 
-#: ../user/team_search.php:181
+#: ../user/team_search.php:202
 msgid ""
 "You can team up with other people with similar interests, or from the same "
 "country, company, or school."
 msgstr "你可以和其他有相同兴趣,或来自同一个国家地区、公司以及学校的用户组成一个团队。"
 
-#: ../user/team_search.php:183
+#: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
 msgstr "使用该表单来寻找可能适合你的团队。"
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
 msgstr "我现在对加入团队%1没兴趣%2。"
 
-#: ../user/top_hosts.php:67 ../user/top_teams.php:100
-#: ../user/top_users.php:112
+#: ../user/top_hosts.php:67 ../user/top_teams.php:102
+#: ../user/top_users.php:113
 msgid "Limit exceeded - Sorry, first %1 items only"
 msgstr "超出限制 - 对不起,仅显示前 %1 个条目"
 
@@ -6168,11 +6144,11 @@ msgstr "超出限制 - 对不起,仅显示前 %1 个条目"
 msgid "Top hosts"
 msgstr "主机排名"
 
-#: ../user/top_teams.php:105
+#: ../user/top_teams.php:107
 msgid "Top %1 teams"
 msgstr "%s 团队排名"
 
-#: ../user/top_teams.php:108
+#: ../user/top_teams.php:110
 msgid "There are no %1 teams"
 msgstr "没有 %1 团队"
 
@@ -6180,11 +6156,11 @@ msgstr "没有 %1 团队"
 msgid "Participant since"
 msgstr "参加时间"
 
-#: ../user/uotd.php:29
+#: ../user/uotd.php:31
 msgid "No user of the day has been chosen."
 msgstr "还未选择每日用户。"
 
-#: ../user/uotd.php:33
+#: ../user/uotd.php:35
 msgid "User of the Day for %1: %2"
 msgstr "%1 的每日用户:%2"
 
@@ -6228,19 +6204,19 @@ msgstr "按近期平均积分降序"
 msgid "Decreasing total credit"
 msgstr "按总积分降序"
 
-#: ../user/user_search.php:100
+#: ../user/user_search.php:84
 msgid "search string must be at least 3 characters"
 msgstr "搜索字符串至少应包含三个字符"
 
-#: ../user/user_search.php:133
+#: ../user/user_search.php:118
 msgid "User search results"
 msgstr "用户搜索结果"
 
-#: ../user/user_search.php:140
+#: ../user/user_search.php:125
 msgid "Joined"
 msgstr "已加入"
 
-#: ../user/user_search.php:148
+#: ../user/user_search.php:133
 msgid "No users match your search criteria."
 msgstr "没有任何用户符合你的搜索条件。"
 
@@ -6308,15 +6284,15 @@ msgstr "验证电子邮箱地址"
 msgid "The email address of your account has been validated."
 msgstr "你的帐户所关联的电子邮箱地址已通过验证。"
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
 msgstr "该用户未建立档案"
 
-#: ../user/view_profile.php:54
+#: ../user/view_profile.php:56
 msgid "Profile: %1"
 msgstr "用户档案:%1"
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
 msgstr "帐户数据"
 
@@ -6370,6 +6346,10 @@ msgstr "找不到任务单元"
 msgid "Workunit %1"
 msgstr "任务单元 %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "计算程序"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "规范结果"
@@ -6379,6 +6359,10 @@ msgid "granted credit"
 msgstr "授予积分"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "任务处理中"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "无法查看等待完成的情况"
 
@@ -6406,59 +6390,70 @@ msgstr "验证"
 msgid "Pending"
 msgstr "等待中"
 
-#: ../project.sample/project.inc:43
+#: ../project.sample/project.inc:70
 msgid "Main page"
 msgstr "主页"
 
-#: ../project.sample/project.inc:45
+#: ../project.sample/project.inc:72
 msgid "Copyright"
 msgstr "版权所有"
 
-#: ../project.sample/project.inc:48
+#: ../project.sample/project.inc:75
 msgid "Generated"
 msgstr "生成时间"
 
-#: ../project.sample/project.inc:79
+#: ../project.sample/project.inc:106
 msgid "Your personal background."
 msgstr "你的个人背景。"
 
-#: ../project.sample/project.inc:83
+#: ../project.sample/project.inc:110
 msgid ""
 "Tell us about yourself. You could tell us where you're from, your age, "
 "occupation, hobbies, or anything else about yourself."
 msgstr "简单介绍一下你自己,比如从哪里来,年龄,职业,兴趣爱好,或者其它任何事情。"
 
-#: ../project.sample/project.inc:87
+#: ../project.sample/project.inc:114
 msgid "Your opinions about %1"
 msgstr "你对 %1 的看法"
 
-#: ../project.sample/project.inc:91
+#: ../project.sample/project.inc:118
 msgid ""
 "Tell us your thoughts about %1<ol>\n"
 "    <li>Why do you run %1?\n"
 "    <li>What are your views about the project?\n"
 "    <li>Any suggestions?\n"
 "    </ol>"
-msgstr "告诉我们你对 %1 的走法<ol>\n    <li>你为什么运行 %1?\n    <li>你对这个项目的观点是什么?\n    <li>有什么建议吗?\n    </ol>"
+msgstr "告诉我们你对 %1 的想法<ol>\n    <li>你为什么运行 %1?\n    <li>你对这个项目的观点是什么?\n    <li>有什么建议吗?\n    </ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
 msgstr "图像的色彩方案"
 
-#: ../project.sample/project_specific_prefs.inc:48
+#: ../project.sample/project_specific_prefs.inc:55
+#, no-php-format
 msgid "Maximum CPU % for graphics%10 ... 100%2"
 msgstr "显示图像时最多可以使用的 CPU 资源%10 ... 100%2"
 
-#: ../project.sample/project_specific_prefs.inc:49
+#: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
 msgstr "仅运行选中的计算程序"
 
-#: ../project.sample/project_specific_prefs.inc:50
+#: ../project.sample/project_specific_prefs.inc:57
+msgid ""
+"Only get tasks for certain applications. Useful to focus on particular "
+"applications, or to exclude them."
+msgstr "只接受使用特定计算程序的任务。用于关注特定的计算程序,或者排除它们。"
+
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
 msgstr "如果选中的计算程序暂时没有计算任务,是否从其它计算程序接收任务?"
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "是否使用更快的非图形化计算程序(如果可用)?"
+
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
 msgstr "(所有计算程序)"
diff --git a/locale/zh_TW/BOINC-Manager.mo b/locale/zh_TW/BOINC-Manager.mo
index c77101b..4b398d5 100644
Binary files a/locale/zh_TW/BOINC-Manager.mo and b/locale/zh_TW/BOINC-Manager.mo differ
diff --git a/locale/zh_TW/BOINC-Manager.po b/locale/zh_TW/BOINC-Manager.po
index a1d8d52..0d9dbe4 100644
--- a/locale/zh_TW/BOINC-Manager.po
+++ b/locale/zh_TW/BOINC-Manager.po
@@ -11,7 +11,7 @@ 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-03-25 06:07+0000\n"
+"PO-Revision-Date: 2015-04-20 12:34+0000\n"
 "Last-Translator: Died <doomdied at gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/boinc/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -2873,7 +2873,7 @@ msgstr "%s - 運算偏好設定"
 
 #: clientgui/sg_DlgPreferences.cpp:1061
 msgid "Discard all local preferences and use web-based preferences?"
-msgstr "放棄本機偏好設定改用網站偏好設定?"
+msgstr "放棄所有本機偏好設定改用網站偏好設定?"
 
 #: clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
diff --git a/locale/zh_TW/BOINC-Web.mo b/locale/zh_TW/BOINC-Web.mo
index f8d8961..2b40421 100644
Binary files a/locale/zh_TW/BOINC-Web.mo and b/locale/zh_TW/BOINC-Web.mo differ
diff --git a/locale/zh_TW/BOINC-Web.po b/locale/zh_TW/BOINC-Web.po
index fc6d11a..fc41d68 100644
--- a/locale/zh_TW/BOINC-Web.po
+++ b/locale/zh_TW/BOINC-Web.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
 "POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2015-03-25 06:11+0000\n"
+"PO-Revision-Date: 2015-04-22 12:56+0000\n"
 "Last-Translator: Willy Wu <df910105 at yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/boinc/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/samples/example_app/MakeMacExample.sh b/samples/example_app/MakeMacExample.sh
index 2344ec8..a1f59ca 100644
--- a/samples/example_app/MakeMacExample.sh
+++ b/samples/example_app/MakeMacExample.sh
@@ -25,6 +25,7 @@
 # Updated 7/12/12 for Xcode 4.3 and later which are not at a fixed address
 # Updated 8/3/12 for TrueType fonts
 # Updated 11/8/12 to add slide_show
+# Updated 4/14/15 to fix build instructions
 #
 ## This script requires OS 10.6 or later
 #
@@ -33,7 +34,6 @@
 ## complete the Xcode installation before running this script.
 #
 ## First, build the BOINC libraries using boinc/mac_build/BuildMacBOINC.sh
-## and boinc/zip/boinc_zip.xcodeproj 
 ## This file assumes the locations of the needed libraries are those 
 ## resulting from following the instructions found in the file:
 ##     boinc/mac_build/HowToBuildBOINC_XCode.rtf
diff --git a/samples/example_app/Makefile_mac b/samples/example_app/Makefile_mac
index 2651c4b..6941bc1 100644
--- a/samples/example_app/Makefile_mac
+++ b/samples/example_app/Makefile_mac
@@ -4,6 +4,7 @@
 # Updated 7/10/12 for OS 10.7 and XCode 4.3 and later
 # Updated 8/3/12 for TrueType fonts
 # Updated 11/8/12 to add slide_show
+# Updated 4/14/15 for compatibility with Xcode 6
 #
 ## First, build the BOINC libraries using boinc/mac_build/BuildMacBOINC.sh
 ## This file assumes the locations of the needed libraries are those 
@@ -23,6 +24,7 @@ FRAMEWORKS_DIR = /System/Library/Frameworks
 
 CXXFLAGS = $(VARIANTFLAGS) \
     -g \
+    -stdlib=libstdc++ \
     -DAPP_GRAPHICS \
     -I$(BOINC_CONFIG_DIR) \
     -I$(BOINC_DIR) \
diff --git a/samples/example_app/Makefile_mac2 b/samples/example_app/Makefile_mac2
index 6368619..fddbcb2 100644
--- a/samples/example_app/Makefile_mac2
+++ b/samples/example_app/Makefile_mac2
@@ -2,10 +2,10 @@
 # Updated 7/11/12 for OS 10.7 and XCode 4.3
 # Updated 8/3/12 for TrueType fonts
 # Updated 11/8/12 to add slide_show
+# Updated 4/14/15 for compatibility with Xcode 6
 #
 ## First, build the BOINC libraries using boinc/mac_build/BuildMacBOINC.sh 
-## and boinc/zip/boinc_zip.xcodeproj
-## This file assumes the locations of the needed libraries are those 
+## This file assumes the locations of the needed libraries are those
 ## resulting from following the instructions found in the file:
 ##     boinc/mac_build/HowToBuildBOINC_XCode.rtf
 ## In Terminal, CD to the example_app directory:
@@ -26,6 +26,7 @@ FRAMEWORKS_DIR = /System/Library/Frameworks
 
 CXXFLAGS_ALL = \
     -g \
+    -stdlib=libstdc++ \
     -DAPP_GRAPHICS \
     -I$(BOINC_CONFIG_DIR) \
     -I$(BOINC_DIR) \
diff --git a/samples/example_app/ReadMe.txt b/samples/example_app/ReadMe.txt
new file mode 100644
index 0000000..2e99b84
--- /dev/null
+++ b/samples/example_app/ReadMe.txt
@@ -0,0 +1,21 @@
+To build the example_app sample (UpperCase2) for Macintosh:
+
+First build the BOINC libraries:
+cd [path]/mac_build
+source BuildMacBOINC.sh -lib
+
+For more details, see the instructions in that script's comments or at:
+[path]/mac_build/HowToBuildBOINC_XCode.rtf
+
+After building the libraries, there are three ways to build the example_app sample for Macintosh:
+
+[1] Run the MakeMacExample.sh script in this example_app directory (which will invoke the makefile Makefile_mac):
+cd [path]/samples/example_app/
+sh MakeMacExample.sh
+
+[2] Invoke the stand-alone makefile Makefile_mac2 directly:
+cd [path]/samples/example_app/
+make -f Makefile_mac2
+
+[3] Run the Xcode project at:
+[path]/samples/mac_build/UpperCase2.xcodeproj
diff --git a/samples/gfx_html/browserctrl_win.cpp b/samples/gfx_html/browserctrl_win.cpp
index 15c6392..f43292d 100644
--- a/samples/gfx_html/browserctrl_win.cpp
+++ b/samples/gfx_html/browserctrl_win.cpp
@@ -40,12 +40,12 @@
 #include "browserctrl_win.h"
 
 
-#ifdef __IDeveloperConsoleMessageReceiver_INTERNAL__
-
 // New for IE10
+#ifndef IDM_ADDCONSOLEMESSAGERECEIVER
 #define IDM_ADDCONSOLEMESSAGERECEIVER     3800
+#endif
+#ifndef IDM_REMOVECONSOLEMESSAGERECEIVER
 #define IDM_REMOVECONSOLEMESSAGERECEIVER  3801
-
 #endif
 
 
diff --git a/samples/openclapp/Makefile_mac b/samples/openclapp/Makefile_mac
index 4e5b390..a717724 100644
--- a/samples/openclapp/Makefile_mac
+++ b/samples/openclapp/Makefile_mac
@@ -3,6 +3,7 @@
 #   cd to the boinc/samples/openclapp directory
 #   make -f Makefile_mac [clean] all
 #
+# Updated 4/14/15 for compatibility with Xcode 6
 
 
 BOINC_DIR = ../..
@@ -10,8 +11,10 @@ BOINC_API_DIR = $(BOINC_DIR)/api
 BOINC_LIB_DIR = $(BOINC_DIR)/lib 
 BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment
 BOINC_MAC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac
+FRAMEWORKS_DIR = /System/Library/Frameworks
 
 CXXFLAGS = -g \
+    -stdlib=libstdc++ \
     -I$(BOINC_DIR) \
     -I$(BOINC_LIB_DIR) \
     -I$(BOINC_API_DIR) \
diff --git a/samples/openclapp/ReadMe.txt b/samples/openclapp/ReadMe.txt
index 29e89ce..ccd677a 100644
--- a/samples/openclapp/ReadMe.txt
+++ b/samples/openclapp/ReadMe.txt
@@ -1,6 +1,14 @@
-Windows projects.
+To build the openclapp sample for Macintosh:
 
-To build for Mac:
+First build the BOINC libraries:
+cd [path]/mac_build
+source BuildMacBOINC.sh -lib
+
+For more details, see the instructions in that script's comments or at:
+[path]/mac_build/HowToBuildBOINC_XCode.rtf
+
+After building the libraries, run the make file in this directory:
+cd [path]/samples/openclapp
 make -f Makefile_mac
 
 To build for Linux (assuming you have installed the appropriate GPU computing SDK):
diff --git a/samples/vboxwrapper/BuildMacVboxWrapper.sh b/samples/vboxwrapper/BuildMacVboxWrapper.sh
index bffeca2..129cd0b 100644
--- a/samples/vboxwrapper/BuildMacVboxWrapper.sh
+++ b/samples/vboxwrapper/BuildMacVboxWrapper.sh
@@ -23,6 +23,7 @@
 # by Charlie Fenton 2/15/10
 # Updated 11/16/11 for XCode 4.1 and OS 10.7 
 # Updated 7/12/12 for Xcode 4.3 and later which are not at a fixed address
+# Updated 4/14/15 for compatibility with Xcode 6
 #
 ## This script requires OS 10.6 or later
 #
@@ -68,10 +69,7 @@ TOOLSPATH2=${ARPATH%/ar}
 
 export PATH="${TOOLSPATH1}":"${TOOLSPATH2}":/usr/local/bin:$PATH
 
-## There is an apparent bug in MacOSX10.8.sdk which causes our 
-## floppyio compilation to fail, so use MacOSX10.7.sdk for now
-##SDKPATH=`xcodebuild -version -sdk macosx Path`
-SDKPATH=`xcodebuild -version -sdk macosx10.7 Path`
+SDKPATH=`xcodebuild -version -sdk macosx Path`
 
 rm -fR i386 x86_64
 
diff --git a/samples/vboxwrapper/Makefile b/samples/vboxwrapper/Makefile
index 61c8028..da8ec01 100644
--- a/samples/vboxwrapper/Makefile
+++ b/samples/vboxwrapper/Makefile
@@ -41,14 +41,11 @@ vboxcheckpoint.o: vboxcheckpoint.cpp
 vboxjob.o: vboxjob.cpp
 	g++ $(CXXFLAGS) -c vboxjob.cpp
 
-vboxlog.o: vboxlog.cpp
-	g++ $(CXXFLAGS) -c vboxlog.cpp
-
 vboxlogging.o: vboxlogging.cpp
 	g++ $(CXXFLAGS) -c vboxlogging.cpp
 
 vboxwrapper.o: vboxwrapper.cpp
 	g++ $(CXXFLAGS) -c vboxwrapper.cpp
 
-vboxwrapper: vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlog.o vboxlogging.o floppyio.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-	g++ $(CXXFLAGS) -o vboxwrapper vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlog.o vboxlogging.o floppyio.o libstdc++.a -pthread -lboinc_api -lboinc
+vboxwrapper: vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
+	g++ $(CXXFLAGS) -o vboxwrapper vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o libstdc++.a -pthread -lboinc_api -lboinc
diff --git a/samples/vboxwrapper/Makefile_mac b/samples/vboxwrapper/Makefile_mac
index 5d05f17..43b5c7f 100644
--- a/samples/vboxwrapper/Makefile_mac
+++ b/samples/vboxwrapper/Makefile_mac
@@ -2,6 +2,8 @@
 # This is invoked from BuildMacVboxWrapper.sh shell script.
 # It should not be used by itself without the script.
 # Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address
+# Updated 4/10/15 to remove deleted files vboxlog.cpp and vboxlog.h
+# Updated 4/14/15 for compatibility with Xcode 6
 
 
 BOINC_DIR = ../..
@@ -27,7 +29,6 @@ OBJ = \
     vbox_vboxmanage.o \
     vboxcheckpoint.o \
     vboxjob.o \
-    vboxlog.o \
     vboxlogging.o \
     vboxwrapper.o
 
@@ -39,28 +40,25 @@ clean:
 	/bin/rm -f $(PROGS) $(OBJ)
 
 floppyio.o: floppyio.cpp
-	g++ $(CXXFLAGS) -c floppyio.cpp
+	$(CXX) $(CXXFLAGS) -c floppyio.cpp
 
 vbox_common.o: vbox_common.cpp
-	g++ $(CXXFLAGS) -c vbox_common.cpp
+	$(CXX) $(CXXFLAGS) -c vbox_common.cpp
 
 vbox_vboxmanage.o: vbox_vboxmanage.cpp
-	g++ $(CXXFLAGS) -c vbox_vboxmanage.cpp
+	$(CXX) $(CXXFLAGS) -c vbox_vboxmanage.cpp
 
 vboxcheckpoint.o: vboxcheckpoint.cpp
-	g++ $(CXXFLAGS) -c vboxcheckpoint.cpp
+	$(CXX) $(CXXFLAGS) -c vboxcheckpoint.cpp
 
 vboxjob.o: vboxjob.cpp
-	g++ $(CXXFLAGS) -c vboxjob.cpp
-
-vboxlog.o: vboxlog.cpp
-	g++ $(CXXFLAGS) -c vboxlog.cpp
+	$(CXX) $(CXXFLAGS) -c vboxjob.cpp
 
 vboxlogging.o: vboxlogging.cpp
-	g++ $(CXXFLAGS) -c vboxlogging.cpp
+	$(CXX) $(CXXFLAGS) -c vboxlogging.cpp
 
 vboxwrapper.o: vboxwrapper.cpp
-	g++ $(CXXFLAGS) -c vboxwrapper.cpp
+	$(CXX) $(CXXFLAGS) -c vboxwrapper.cpp
 
-vboxwrapper: vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlog.o vboxlogging.o floppyio.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vboxwrapper vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlog.o vboxlogging.o floppyio.o libstdc++.a -pthread -lboinc_api -lboinc
+vboxwrapper: vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_api.a
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vboxwrapper vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o -pthread -lboinc_api -lboinc
diff --git a/samples/vboxwrapper/ReadMe.txt b/samples/vboxwrapper/ReadMe.txt
new file mode 100644
index 0000000..0502172
--- /dev/null
+++ b/samples/vboxwrapper/ReadMe.txt
@@ -0,0 +1,17 @@
+To build VBoxWrapper for Macintosh:
+
+First build the BOINC libraries:
+cd [path]/mac_build
+source BuildMacBOINC.sh -lib
+
+For more details, see the instructions in that script's comments or at:
+[path]/mac_build/HowToBuildBOINC_XCode.rtf
+
+After building the libraries, there are two ways to build VBoxWrapper for Macintosh:
+
+[1] Run the Xcode project at:
+[path]/samples/vboxwrapper/vboxwrapper.xcodeproj
+
+[2] Run the BuildMacVboxWrapper.sh script in this vboxwrapper directory (which will invoke the makefile Makefile_mac):
+cd [path]/samples/vboxwrapper/
+sh BuildMacVboxWrapper.sh
diff --git a/samples/vboxwrapper/vbox_common.cpp b/samples/vboxwrapper/vbox_common.cpp
index d2f0820..4cca281 100644
--- a/samples/vboxwrapper/vbox_common.cpp
+++ b/samples/vboxwrapper/vbox_common.cpp
@@ -110,6 +110,7 @@ VBOX_BASE::VBOX_BASE() : VBOX_JOB() {
     saving = false;
     restoring = false;
     crashed = false;
+    started_successfully = false;
     register_only = false;
     rd_host_port = 0;
     headless = true;
@@ -216,12 +217,14 @@ void VBOX_BASE::cleanup() {
 void VBOX_BASE::dump_hypervisor_logs(bool include_error_logs) {
     string local_system_log;
     string local_vm_log;
+    string local_startup_log;
     string local_trace_log;
     unsigned long vm_exit_code = 0;
 
     get_system_log(local_system_log);
     get_vm_log(local_vm_log);
     get_trace_log(local_trace_log);
+    get_startup_log(local_startup_log);
     get_vm_exit_code(vm_exit_code);
 
     if (include_error_logs) {
@@ -232,10 +235,13 @@ void VBOX_BASE::dump_hypervisor_logs(bool include_error_logs) {
             "%s\n"
             "    VM Execution Log:\n\n"
             "%s\n"
+            "    VM Startup Log:\n\n"
+            "%s\n"
             "    VM Trace Log:\n\n"
             "%s",
             local_system_log.c_str(),
             local_vm_log.c_str(),
+            local_startup_log.c_str(),
             local_trace_log.c_str()
         );
     }
@@ -511,6 +517,55 @@ int VBOX_BASE::get_trace_log(string& log, bool tail_only, unsigned int buffer_si
     return retval;
 }
 
+int VBOX_BASE::get_startup_log(string& log, bool tail_only, unsigned int buffer_size) {
+    string slot_directory;
+    string virtualbox_startup_log_src;
+    string virtualbox_startup_log_dst;
+    string::iterator iter;
+    int retval = BOINC_SUCCESS;
+
+    // Where should we copy temp files to?
+    get_slot_directory(slot_directory);
+
+    // Locate and read log file
+    virtualbox_startup_log_src = vm_master_name + "/Logs/VBoxStartup.log";
+    virtualbox_startup_log_dst = slot_directory + "/VBoxStartup.log";
+
+    if (boinc_file_exists(virtualbox_startup_log_src.c_str())) {
+        // Skip having to deal with various forms of file locks by just making a temp
+        // copy of the log file.
+        boinc_copy(virtualbox_startup_log_src.c_str(), virtualbox_startup_log_dst.c_str());
+    }
+
+    if (boinc_file_exists(virtualbox_startup_log_dst.c_str())) {
+        if (tail_only) {
+            // Keep only the last 8k if it is larger than that.
+            read_file_string(virtualbox_startup_log_dst.c_str(), log, buffer_size, true);
+        } else {
+            read_file_string(virtualbox_startup_log_dst.c_str(), log);
+        }
+
+        sanitize_output(log);
+
+        if (tail_only) {
+            if (log.size() >= (buffer_size - 115)) {
+                // Look for the next whole line of text.
+                iter = log.begin();
+                while (iter != log.end()) {
+                    if (*iter == '\n') {
+                        log.erase(iter);
+                        break;
+                    }
+                    iter = log.erase(iter);
+                }
+            }
+        }
+
+    }
+
+    return retval;
+}
+
 int VBOX_BASE::read_floppy(std::string& data) {
     if (enable_floppyio && pFloppy) {
         data = pFloppy->receive();
diff --git a/samples/vboxwrapper/vbox_common.h b/samples/vboxwrapper/vbox_common.h
index 373283b..125517d 100644
--- a/samples/vboxwrapper/vbox_common.h
+++ b/samples/vboxwrapper/vbox_common.h
@@ -107,45 +107,47 @@ public:
 
     FloppyIONS::FloppyIO* pFloppy;
 
+    // last polled copy of the log file
     std::string vm_log;
-        // last polled copy of the log file
+    // last VM guest log entry detected
     VBOX_TIMESTAMP vm_log_timestamp;
-        // last VM guest log entry detected
+    // unique name for the VM
     std::string vm_master_name;
-        // unique name for the VM
+    // unique description for the VM
     std::string vm_master_description;
-        // unique description for the VM
+    // unique name for the VM or UUID of a stale VM if deregistering it
     std::string vm_name;
-        // unique name for the VM or UUID of a stale VM if deregistering it
+    // required CPU core count
     std::string vm_cpu_count;
-        // required CPU core count
+    // name of the virtual machine disk image file
     std::string image_filename;
-        // name of the virtual machine disk image file
+    // name of the virtual machine iso9660 disk image file
     std::string iso_image_filename;
-        // name of the virtual machine iso9660 disk image file
+    // name of the virtual machine cache disk image file
     std::string cache_disk_filename;
-        // name of the virtual machine cache disk image file
+    // name of the virtual machine floppy disk image file
     std::string floppy_image_filename;
-        // name of the virtual machine floppy disk image file
+    // amount of CPU time consumed by the VM (note: use get_vm_cpu_time())
     double current_cpu_time;
-        // amount of CPU time consumed by the VM (note: use get_vm_cpu_time())
+    // is the VM suspended?
     bool suspended;
-        // is the VM suspended?
+    // is network access temporarily suspended?
     bool network_suspended;
-        // is network access temporarily suspended?
+    // is VM even online?
     bool online;
-        // is VM even online?
+    // Is VM saving from checkpoint?
     bool saving;
-        // Is VM saving from checkpoint?
+    // Is VM restoring from checkpoint?
     bool restoring;
-        // Is VM restoring from checkpoint?
+    // Has the VM crashed?
     bool crashed;
-        // Has the VM crashed?
+    // Has the VM been successfully started?
+    bool started_successfully;
+    // whether we were instructed to only register the VM.
+    // useful for debugging VMs.
     bool register_only;
-        // whether we were instructed to only register the VM.
-        // useful for debugging VMs.
+    // for optional remote desktop; dynamically assigned
     int rd_host_port;
-        // for optional remote desktop; dynamically assigned
     bool headless;
 
     int vm_pid;
@@ -212,6 +214,7 @@ public:
     virtual int get_system_log(std::string& log, bool tail_only = true, unsigned int buffer_size = 8192);
     virtual int get_vm_log(std::string& log, bool tail_only = true, unsigned int buffer_size = 8192);
     virtual int get_trace_log(std::string& log, bool tail_only = true, unsigned int buffer_size = 8192);
+    virtual int get_startup_log(std::string& log, bool tail_only = true, unsigned int buffer_size = 8192);
 
     virtual int set_network_access(bool enabled) = 0;
     virtual int set_cpu_usage(int percentage) = 0;
diff --git a/samples/vboxwrapper/vbox_mscom_impl.cpp b/samples/vboxwrapper/vbox_mscom_impl.cpp
index ae73642..29aa034 100644
--- a/samples/vboxwrapper/vbox_mscom_impl.cpp
+++ b/samples/vboxwrapper/vbox_mscom_impl.cpp
@@ -100,6 +100,27 @@ int virtualbox_check_error(HRESULT rc, char* szFunction, char* szFile, int iLine
     return rc;
 }
 
+void __stdcall virtualbox_com_raise_error(HRESULT rc, IErrorInfo* perrinfo) {
+    HRESULT hr;
+    CComPtr<IErrorInfo> pErrorInfo;
+    CComBSTR strSource;
+    CComBSTR strDescription;
+
+    pErrorInfo.Attach(perrinfo);
+
+    vboxlog_msg("COM Error 0x%x", rc);
+    hr = pErrorInfo->GetSource(&strSource);
+    if (SUCCEEDED(hr) && strSource) {
+        vboxlog_msg("Error Source     : %S", strSource);
+    }
+    hr = pErrorInfo->GetDescription(&strDescription);
+    if (SUCCEEDED(hr) && strDescription) {
+        vboxlog_msg("Error Description: %S", strDescription);
+    }
+
+    DebugBreak();
+}
+
 
 // We want to recurisively walk the snapshot tree so that we can get the most recent children first.
 // We also want to skip whatever the most current snapshot is.
@@ -166,6 +187,10 @@ void TraverseMediums(std::vector<CComPtr<IMedium>>& mediums, IMedium* pMedium) {
 
 
 VBOX_VM::VBOX_VM() {
+    // Initialize COM Exception Trap
+    //
+    _set_com_error_handler(virtualbox_com_raise_error);
+
     m_pPrivate = new VBOX_PRIV();
 }
 
@@ -605,25 +630,27 @@ int VBOX_VM::create_vm() {
 
         // Add guest additions to the VM
         //
-        vboxlog_msg("Adding VirtualBox Guest Additions to VM.");
-        CComPtr<IMedium> pGuestAdditionsImage;
-        rc = m_pPrivate->m_pVirtualBox->OpenMedium(
-            CComBSTR(virtualbox_guest_additions.c_str()),
-            DeviceType_DVD,
-            AccessMode_ReadOnly,
-            FALSE,
-            &pGuestAdditionsImage
-        );
-        if (CHECK_ERROR(rc)) goto CLEANUP;
+        if (virtualbox_guest_additions.size()) {
+            vboxlog_msg("Adding VirtualBox Guest Additions to VM.");
+            CComPtr<IMedium> pGuestAdditionsImage;
+            rc = m_pPrivate->m_pVirtualBox->OpenMedium(
+                CComBSTR(virtualbox_guest_additions.c_str()),
+                DeviceType_DVD,
+                AccessMode_ReadOnly,
+                FALSE,
+                &pGuestAdditionsImage
+            );
+            if (CHECK_ERROR(rc)) goto CLEANUP;
 
-        rc = pMachine->AttachDevice(
-            CComBSTR("Hard Disk Controller"),
-            2,
-            0,
-            DeviceType_DVD,
-            pGuestAdditionsImage
-        );
-        if (CHECK_ERROR(rc)) goto CLEANUP;
+            rc = pMachine->AttachDevice(
+                CComBSTR("Hard Disk Controller"),
+                2,
+                0,
+                DeviceType_DVD,
+                pGuestAdditionsImage
+            );
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+        }
 
         // Add a virtual cache disk drive to VM
         //
@@ -673,25 +700,27 @@ int VBOX_VM::create_vm() {
 
         // Add guest additions to the VM
         //
-        vboxlog_msg("Adding VirtualBox Guest Additions to VM.");
-        CComPtr<IMedium> pGuestAdditionsImage;
-        rc = m_pPrivate->m_pVirtualBox->OpenMedium(
-            CComBSTR(virtualbox_guest_additions.c_str()),
-            DeviceType_DVD,
-            AccessMode_ReadOnly,
-            FALSE,
-            &pGuestAdditionsImage
-        );
-        if (CHECK_ERROR(rc)) goto CLEANUP;
+        if (virtualbox_guest_additions.size()) {
+            vboxlog_msg("Adding VirtualBox Guest Additions to VM.");
+            CComPtr<IMedium> pGuestAdditionsImage;
+            rc = m_pPrivate->m_pVirtualBox->OpenMedium(
+                CComBSTR(virtualbox_guest_additions.c_str()),
+                DeviceType_DVD,
+                AccessMode_ReadOnly,
+                FALSE,
+                &pGuestAdditionsImage
+            );
+            if (CHECK_ERROR(rc)) goto CLEANUP;
 
-        rc = pMachine->AttachDevice(
-            CComBSTR("Hard Disk Controller"),
-            1,
-            0,
-            DeviceType_DVD,
-            pGuestAdditionsImage
-        );
-        if (CHECK_ERROR(rc)) goto CLEANUP;
+            rc = pMachine->AttachDevice(
+                CComBSTR("Hard Disk Controller"),
+                1,
+                0,
+                DeviceType_DVD,
+                pGuestAdditionsImage
+            );
+            if (CHECK_ERROR(rc)) goto CLEANUP;
+        }
     }
 
     // Adding virtual floppy disk drive to VM
@@ -1173,7 +1202,7 @@ int VBOX_VM::poll(bool log_state) {
     if (aid.using_sandbox && vboxsvc_pid_handle && !process_exists(vboxsvc_pid_handle)) {
         vboxlog_msg("Status Report: vboxsvc.exe is no longer running.");
     }
-    if (vm_pid_handle && !process_exists(vm_pid_handle)) {
+    if (started_successfully && vm_pid_handle && !process_exists(vm_pid_handle)) {
         vboxlog_msg("Status Report: virtualbox.exe/vboxheadless.exe is no longer running.");
     }
 
@@ -1372,6 +1401,7 @@ int VBOX_VM::start() {
             } while (timeout >= dtime());
 
             vboxlog_msg("Successfully started VM. (PID = '%d')", vm_pid);
+            started_successfully = true;
             retval = BOINC_SUCCESS;
         } else {
             vboxlog_msg("VM failed to start.");
@@ -1512,10 +1542,12 @@ int VBOX_VM::pause() {
     if (CHECK_ERROR(rc)) goto CLEANUP;
 
     // Pause the machine.
-    rc = pConsole->Pause();
-    if (CHECK_ERROR(rc)) goto CLEANUP;
+    if (pConsole) {
+        rc = pConsole->Pause();
+        if (CHECK_ERROR(rc)) goto CLEANUP;
 
-    retval = BOINC_SUCCESS;
+        retval = BOINC_SUCCESS;
+    }
 
 CLEANUP:
     return retval;
@@ -1539,10 +1571,12 @@ int VBOX_VM::resume() {
     if (CHECK_ERROR(rc)) goto CLEANUP;
 
     // Resume the machine.
-    rc = pConsole->Resume();
-    if (CHECK_ERROR(rc)) goto CLEANUP;
+    if (pConsole) {
+        rc = pConsole->Resume();
+        if (CHECK_ERROR(rc)) goto CLEANUP;
 
-    retval = BOINC_SUCCESS;
+        retval = BOINC_SUCCESS;
+    }
 
 CLEANUP:
     return retval;
@@ -1935,7 +1969,7 @@ int VBOX_VM::get_version_information(string& version) {
 }
 
 int VBOX_VM::get_guest_additions(string& guest_additions) {
-    int retval = ERR_EXEC;
+    int retval = ERR_NOT_FOUND;
     HRESULT rc;
     CComPtr<ISystemProperties> properties;
     CComBSTR tmp;
@@ -1945,7 +1979,11 @@ int VBOX_VM::get_guest_additions(string& guest_additions) {
         rc = properties->get_DefaultAdditionsISO(&tmp);
         if (SUCCEEDED(rc)) {
             guest_additions = CW2A(tmp);
-            retval = BOINC_SUCCESS;
+            if (!boinc_file_exists(guest_additions.c_str())) {
+                guest_additions.clear();
+            } else {
+                retval = BOINC_SUCCESS;
+            }
         }
     }
 
@@ -2249,7 +2287,28 @@ int VBOX_VM::launch_vboxsvc() {
 
                 command = "\"VBoxSVC.exe\" --logrotate 1";
 
-                CreateProcess(NULL, (LPTSTR)command.c_str(), NULL, NULL, TRUE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
+                // Execute command
+                if (!CreateProcess(
+                    NULL,
+                    (LPTSTR)command.c_str(),
+                    NULL,
+                    NULL,
+                    TRUE,
+                    CREATE_NO_WINDOW,
+                    NULL,
+                    virtualbox_home_directory.c_str(),
+                    &si,
+                    &pi
+                )) {
+                    vboxlog_msg(
+                        "Status Report: Launching vboxsvc.exe failed!."
+                    );
+                    vboxlog_msg(
+                        "        Error: %s (%d)",
+                        windows_format_error_string(GetLastError(), buf, sizeof(buf)),
+                        GetLastError()
+                    );
+                }
 
                 if (pi.hThread) CloseHandle(pi.hThread);
                 if (pi.hProcess) {
@@ -2257,9 +2316,6 @@ int VBOX_VM::launch_vboxsvc() {
                     vboxsvc_pid = pi.dwProcessId;
                     vboxsvc_pid_handle = pi.hProcess;
                     retval = BOINC_SUCCESS;
-                } else {
-                    vboxlog_msg("Status Report: Launching vboxsvc.exe failed!.");
-                    vboxlog_msg("        Error: %s", windows_format_error_string(GetLastError(), buf, sizeof(buf)));
                 }
             }
         }
diff --git a/samples/vboxwrapper/vbox_vboxmanage.cpp b/samples/vboxwrapper/vbox_vboxmanage.cpp
index 4b60982..f506cea 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"
@@ -448,16 +449,18 @@ int VBOX_VM::create_vm() {
 
         // Add guest additions to the VM
         //
-        vboxlog_msg("Adding VirtualBox Guest Additions to VM.");
-        command  = "storageattach \"" + vm_name + "\" ";
-        command += "--storagectl \"Hard Disk Controller\" ";
-        command += "--port 2 ";
-        command += "--device 0 ";
-        command += "--type dvddrive ";
-        command += "--medium \"" + virtualbox_guest_additions + "\" ";
+        if (virtualbox_guest_additions.size()) {
+            vboxlog_msg("Adding VirtualBox Guest Additions to VM.");
+            command  = "storageattach \"" + vm_name + "\" ";
+            command += "--storagectl \"Hard Disk Controller\" ";
+            command += "--port 2 ";
+            command += "--device 0 ";
+            command += "--type dvddrive ";
+            command += "--medium \"" + virtualbox_guest_additions + "\" ";
 
-        retval = vbm_popen(command, output, "storage attach (guest additions image)");
-        if (retval) return retval;
+            retval = vbm_popen(command, output, "storage attach (guest additions image)");
+            if (retval) return retval;
+        }
 
         // Add a virtual cache disk drive to VM
         //
@@ -493,16 +496,18 @@ int VBOX_VM::create_vm() {
 
         // Add guest additions to the VM
         //
-        vboxlog_msg("Adding VirtualBox Guest Additions to VM.");
-        command  = "storageattach \"" + vm_name + "\" ";
-        command += "--storagectl \"Hard Disk Controller\" ";
-        command += "--port 1 ";
-        command += "--device 0 ";
-        command += "--type dvddrive ";
-        command += "--medium \"" + virtualbox_guest_additions + "\" ";
+        if (virtualbox_guest_additions.size()) {
+            vboxlog_msg("Adding VirtualBox Guest Additions to VM.");
+            command  = "storageattach \"" + vm_name + "\" ";
+            command += "--storagectl \"Hard Disk Controller\" ";
+            command += "--port 1 ";
+            command += "--device 0 ";
+            command += "--type dvddrive ";
+            command += "--medium \"" + virtualbox_guest_additions + "\" ";
 
-        retval = vbm_popen(command, output, "storage attach (guest additions image)");
-        if (retval) return retval;
+            retval = vbm_popen(command, output, "storage attach (guest additions image)");
+            if (retval) return retval;
+        }
 
     }
 
@@ -844,11 +849,11 @@ int VBOX_VM::poll(bool log_state) {
     if (aid.using_sandbox && vboxsvc_pid_handle && !process_exists(vboxsvc_pid_handle)) {
         vboxlog_msg("Status Report: vboxsvc.exe is no longer running.");
     }
-    if (vm_pid_handle && !process_exists(vm_pid_handle)) {
+    if (started_successfully && vm_pid_handle && !process_exists(vm_pid_handle)) {
         vboxlog_msg("Status Report: virtualbox.exe/vboxheadless.exe is no longer running.");
     }
 #else
-    if (vm_pid && !process_exists(vm_pid)) {
+    if (started_successfully && vm_pid && !process_exists(vm_pid)) {
         vboxlog_msg("Status Report: virtualbox/vboxheadless is no longer running.");
     }
 #endif
@@ -1013,6 +1018,7 @@ int VBOX_VM::start() {
 
     if (BOINC_SUCCESS == retval) {
         vboxlog_msg("Successfully started VM. (PID = '%d')", vm_pid);
+        started_successfully = true;
     } else {
         vboxlog_msg("VM failed to start.");
     }
@@ -1346,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;
 }
 
@@ -1463,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 ";
@@ -1479,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;
@@ -1514,10 +1544,16 @@ int VBOX_VM::get_guest_additions(string& guest_additions) {
     ga_end = output.find("\n", ga_start);
     guest_additions = output.substr(ga_start, ga_end - ga_start);
     strip_whitespace(guest_additions);
+
     if (guest_additions.size() <= 0) {
         return ERR_NOT_FOUND;
     }
 
+    if (!boinc_file_exists(guest_additions.c_str())) {
+        guest_additions.clear();
+        return ERR_NOT_FOUND;
+    }
+
     return retval;
 }
 
diff --git a/samples/vboxwrapper/vboxlog.cpp b/samples/vboxwrapper/vboxlog.cpp
deleted file mode 100644
index faa6f71..0000000
--- a/samples/vboxwrapper/vboxlog.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010-2012 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifdef _WIN32
-#include "boinc_win.h"
-#include "win_util.h"
-#else
-#include <vector>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <cmath>
-#include <string>
-#include <unistd.h>
-#endif
-
diff --git a/samples/vboxwrapper/vboxlog.h b/samples/vboxwrapper/vboxlog.h
deleted file mode 100644
index 8ba5c73..0000000
--- a/samples/vboxwrapper/vboxlog.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2010-2012 University of California
-//
-// BOINC is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// BOINC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef _VBOXLOG_H_
-#define _VBOXLOG_H_
-
-#endif
diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp
index e937e53..b396949 100644
--- a/samples/vboxwrapper/vboxwrapper.cpp
+++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -80,6 +80,7 @@
 #ifdef _WIN32
 #include "vbox_mscom42.h"
 #include "vbox_mscom43.h"
+#include "vbox_mscom50.h"
 #endif
 #include "vbox_vboxmanage.h"
 
@@ -368,6 +369,7 @@ int main(int argc, char** argv) {
     APP_INIT_DATA aid;
     VBOX_VM* pVM = NULL;
     VBOX_CHECKPOINT checkpoint;
+    double desired_checkpoint_interval = 0;
     double random_checkpoint_factor = 0;
     double elapsed_time = 0;
     double fraction_done = 0;
@@ -395,7 +397,6 @@ int main(int argc, char** argv) {
     string message;
     char buf[256];
 
-
     // Initialize diagnostics system
     //
     boinc_init_diagnostics(BOINC_DIAG_DEFAULTS);
@@ -444,7 +445,9 @@ int main(int argc, char** argv) {
     int vbox_major = 0, vbox_minor = 0;
 
     if (BOINC_SUCCESS != vbox42::VBOX_VM::get_version_information(vbox_version)) {
-        vbox43::VBOX_VM::get_version_information(vbox_version);
+        if (BOINC_SUCCESS != vbox43::VBOX_VM::get_version_information(vbox_version)) {
+            vbox50::VBOX_VM::get_version_information(vbox_version);
+        }
     }
     if (!vbox_version.empty()) {
         sscanf(vbox_version.c_str(), "%d.%d", &vbox_major, &vbox_minor);
@@ -454,6 +457,9 @@ int main(int argc, char** argv) {
         if ((4 == vbox_major) && (3 == vbox_minor)) {
             pVM = (VBOX_VM*) new vbox43::VBOX_VM();
         }
+        if ((5 == vbox_major) && (0 == vbox_minor)) {
+            pVM = (VBOX_VM*) new vbox50::VBOX_VM();
+        }
     }
     if (!pVM) {
         pVM = (VBOX_VM*) new vboxmanage::VBOX_VM();
@@ -491,6 +497,7 @@ int main(int argc, char** argv) {
         srand((int)(vm_image_stat.st_mtime * time(NULL)));
     }
     random_checkpoint_factor = (double)(((int)(drand() * 100000.0)) % 600);
+
     vboxlog_msg("Feature: Checkpoint interval offset (%d seconds)", (int)random_checkpoint_factor);
 
     // Display trickle value if specified
@@ -1030,10 +1037,17 @@ int main(int argc, char** argv) {
                 pVM->dump_hypervisor_status_reports();
             }
 
+            // Real VM checkpoints (snapshots) are expensive, don't do them very often.
+            // 
+            // If the project has disabled automatic checkpoints, just report that we have
+            // successfully completed the checkpoint as soon as the API reports that we should
+            // checkpoint.
+            //
             if (boinc_time_to_checkpoint()) {
-                // Only peform a VM checkpoint every ten minutes or so.
-                //
-                if (elapsed_time >= last_checkpoint_elapsed_time + pVM->minimum_checkpoint_interval + random_checkpoint_factor) {
+                if (
+                    (elapsed_time >= last_checkpoint_elapsed_time + desired_checkpoint_interval + random_checkpoint_factor) ||
+                    pVM->disable_automatic_checkpoints
+                ) {
                     // Basic interleave factor is only needed once.
                     if (random_checkpoint_factor > 0) {
                         random_checkpoint_factor = 0.0;
@@ -1059,12 +1073,14 @@ int main(int argc, char** argv) {
                 }
             }
 
-            // send elapsed-time trickle message if needed
+            // Send elapsed-time trickle message if needed
             //
             if (trickle_period) {
                 check_trickle_period(elapsed_time, trickle_period);
             }
 
+            // Changes detected, re-read preferences
+            //
             if (boinc_status.reread_init_data_file) {
                 boinc_status.reread_init_data_file = false;
 
@@ -1074,7 +1090,17 @@ int main(int argc, char** argv) {
                 boinc_get_init_data_p(&aid);
                 set_throttles(aid, *pVM);
 
-                vboxlog_msg("Checkpoint Interval is now %d seconds.", (int)aid.checkpoint_period);
+                desired_checkpoint_interval = aid.checkpoint_period;
+                if (pVM->minimum_checkpoint_interval > aid.checkpoint_period) {
+                    desired_checkpoint_interval = pVM->minimum_checkpoint_interval;
+                }
+
+                vboxlog_msg(
+                    "Setting checkpoint interval to %d seconds. (Higher value of (Preference: %d seconds) or (Vbox_job.xml: %d seconds))",
+                    (int)desired_checkpoint_interval,
+                    (int)aid.checkpoint_period,
+                    (int)pVM->minimum_checkpoint_interval
+                );
             }
 
             // if the VM has a maximum amount of time it is allowed to run,
diff --git a/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj b/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj
index f30a1ba..4f48fff 100644
--- a/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj
+++ b/samples/vboxwrapper/vboxwrapper.xcodeproj/project.pbxproj
@@ -36,8 +36,6 @@
 		DDC81AFB1A6888A7000D8CEA /* vbox_vboxmanage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AF91A6888A7000D8CEA /* vbox_vboxmanage.cpp */; };
 		DDC81B021A688939000D8CEA /* vboxlogging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AFD1A688939000D8CEA /* vboxlogging.cpp */; };
 		DDC81B031A688939000D8CEA /* vboxlogging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AFD1A688939000D8CEA /* vboxlogging.cpp */; };
-		DDC81B041A688939000D8CEA /* vboxlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AFE1A688939000D8CEA /* vboxlog.cpp */; };
-		DDC81B051A688939000D8CEA /* vboxlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC81AFE1A688939000D8CEA /* vboxlog.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -72,8 +70,6 @@
 		DDC81AF91A6888A7000D8CEA /* vbox_vboxmanage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vbox_vboxmanage.cpp; sourceTree = "<group>"; };
 		DDC81AFC1A688902000D8CEA /* vbox_vboxmanage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vbox_vboxmanage.h; sourceTree = "<group>"; };
 		DDC81AFD1A688939000D8CEA /* vboxlogging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vboxlogging.cpp; sourceTree = "<group>"; };
-		DDC81AFE1A688939000D8CEA /* vboxlog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vboxlog.cpp; sourceTree = "<group>"; };
-		DDC81AFF1A688939000D8CEA /* vboxlog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vboxlog.h; sourceTree = "<group>"; };
 		DDC81B001A688939000D8CEA /* vboxlogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vboxlogging.h; sourceTree = "<group>"; };
 		DDC81B011A688939000D8CEA /* vboxwrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vboxwrapper.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -112,8 +108,6 @@
 				DDC81B011A688939000D8CEA /* vboxwrapper.h */,
 				DDC81AFD1A688939000D8CEA /* vboxlogging.cpp */,
 				DDC81B001A688939000D8CEA /* vboxlogging.h */,
-				DDC81AFE1A688939000D8CEA /* vboxlog.cpp */,
-				DDC81AFF1A688939000D8CEA /* vboxlog.h */,
 				DDC81AF91A6888A7000D8CEA /* vbox_vboxmanage.cpp */,
 				DDC81AFC1A688902000D8CEA /* vbox_vboxmanage.h */,
 				DDC81AF11A68884B000D8CEA /* vboxjob.cpp */,
@@ -243,7 +237,6 @@
 				DDC81AF51A68884B000D8CEA /* vboxjob.cpp in Sources */,
 				DDC81AEF1A688808000D8CEA /* vbox_common.cpp in Sources */,
 				DDC81B021A688939000D8CEA /* vboxlogging.cpp in Sources */,
-				DDC81B041A688939000D8CEA /* vboxlog.cpp in Sources */,
 				DDC81AFA1A6888A7000D8CEA /* vbox_vboxmanage.cpp in Sources */,
 				DDC81AF71A68884B000D8CEA /* vboxcheckpoint.cpp in Sources */,
 			);
@@ -258,7 +251,6 @@
 				DDC81AF61A68884B000D8CEA /* vboxjob.cpp in Sources */,
 				DDC81AF01A688808000D8CEA /* vbox_common.cpp in Sources */,
 				DDC81B031A688939000D8CEA /* vboxlogging.cpp in Sources */,
-				DDC81B051A688939000D8CEA /* vboxlog.cpp in Sources */,
 				DDC81AFB1A6888A7000D8CEA /* vbox_vboxmanage.cpp in Sources */,
 				DDC81AF81A68884B000D8CEA /* vboxcheckpoint.cpp in Sources */,
 			);
diff --git a/samples/wrapper/Makefile_mac b/samples/wrapper/Makefile_mac
index 9f505aa..06731c8 100644
--- a/samples/wrapper/Makefile_mac
+++ b/samples/wrapper/Makefile_mac
@@ -1,4 +1,7 @@
-# This should work on Mac OS 10.6 with XCode 3.2.  Modify as needed for other platforms.
+# makefile for BOINC wrapper application on Macintosh.
+# This is invoked from BuildMacWrapper.sh shell script.
+# It should not be used by itself without the script.
+# Updated 4/14/15 for compatibility with Xcode 6
 
 # Change the following to match your installation
 BOINC_DIR = ../..
diff --git a/samples/wrapper/ReadMe.txt b/samples/wrapper/ReadMe.txt
new file mode 100644
index 0000000..54c8304
--- /dev/null
+++ b/samples/wrapper/ReadMe.txt
@@ -0,0 +1,12 @@
+To build wrapper for Macintosh:
+
+First build the BOINC libraries:
+cd [path]/mac_build
+source BuildMacBOINC.sh -lib
+
+For more details, see the instructions in that script's comments or at:
+[path]/mac_build/HowToBuildBOINC_XCode.rtf
+
+After building the libraries, run the BuildMacWrapper.sh script in this wrapper directory (which will invoke the makefile Makefile_mac):
+cd [path]/samples/wrapper/
+sh BuildMacWrapper.sh
diff --git a/samples/wrapper/wrapper.cpp b/samples/wrapper/wrapper.cpp
index 67fb2a7..a9e4263 100644
--- a/samples/wrapper/wrapper.cpp
+++ b/samples/wrapper/wrapper.cpp
@@ -970,17 +970,22 @@ void write_checkpoint(int ntasks_completed, double cpu, double rt) {
     boinc_checkpoint_completed();
 }
 
+// read the checkpoint file;
+// return nonzero if it's missing or bad format
+//
 int read_checkpoint(int& ntasks_completed, double& cpu, double& rt) {
     int nt;
     double c, r;
 
     ntasks_completed = 0;
     cpu = 0;
+    rt = 0;
     FILE* f = fopen(CHECKPOINT_FILENAME, "r");
     if (!f) return ERR_FOPEN;
     int n = fscanf(f, "%d %lf %lf", &nt, &c, &r);
     fclose(f);
-    if (n != 2) return 0;
+    if (n != 3) return -1;
+
     ntasks_completed = nt;
     cpu = c;
     rt = r;
@@ -1025,8 +1030,7 @@ int main(int argc, char** argv) {
     if (retval && !zip_filename.empty()) {
         // this is the first time we've run.
         // If we're going to zip output files,
-        // make a list of files present at this point
-        // so we can exclude them.
+        // make a list of files present at this point so we can exclude them.
         //
         write_checkpoint(0, 0, 0);
         get_initial_file_list();
diff --git a/sched/sched_assign.cpp b/sched/sched_assign.cpp
index 8933201..8b1865e 100644
--- a/sched/sched_assign.cpp
+++ b/sched/sched_assign.cpp
@@ -256,7 +256,10 @@ bool send_jobs(int assign_type) {
     }
 
     while (!asg.enumerate(query)) {
-        if (!work_needed(false)) continue; 
+        if (!work_needed(false)) {
+            asg.end_enumerate();
+            break;
+        }
 
         // if the WU doesn't exist, delete the assignment record.
         //
diff --git a/sched/sched_score.h b/sched/sched_score.h
index 6452890..76c82ee 100644
--- a/sched/sched_score.h
+++ b/sched/sched_score.h
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2015 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -15,10 +15,10 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
-// job dispatch using a score-based approach.  See sched_scure.cpp
+// job dispatch using a score-based approach.  See sched_score.cpp
 
 struct JOB {
-    int index;
+    int index;          // index into shared-mem job array
     int result_id;
     double score;
     APP* app;
diff --git a/sched/validator.cpp b/sched/validator.cpp
index 04c5374..a89a248 100644
--- a/sched/validator.cpp
+++ b/sched/validator.cpp
@@ -44,6 +44,7 @@
 //  [--credit_from_runtime X]   grant credit based on runtime,
 //                              assuming single-CPU app.
 //                              X is the max runtime.
+//  [--wu_id n]                 Validate WU n (debugging)
 
 #include "config.h"
 #include <unistd.h>
@@ -104,6 +105,7 @@ bool credit_from_runtime = false;
 double max_runtime = 0;
 bool no_credit = false;
 bool dry_run = false;
+int wu_id = 0;
 int g_argc;
 char **g_argv;
 
@@ -700,6 +702,11 @@ bool do_validate_scan() {
     // loop over entries that need to be checked
     //
     while (1) {
+        if (wu_id) {
+            // kludge to tell enumerate to return a given WU
+            wu_id_modulus = 1;
+            wu_id_remainder = wu_id;
+        }
         retval = validator.enumerate(
             app.id, SELECT_LIMIT, wu_id_modulus, wu_id_remainder,
             wu_id_min, wu_id_max, items
@@ -716,6 +723,7 @@ bool do_validate_scan() {
         retval = handle_wu(validator, items);
         if (!retval) found = true;
         if (++i == one_pass_N_WU) break;
+        if (wu_id) break;
     }
     return found;
 }
@@ -780,6 +788,7 @@ int main(int argc, char** argv) {
       "  --credit_from_runtime X  Grant credit based on runtime (max X seconds)and estimated FLOPS\n"
       "  --no_credit             Don't grant credit\n"
       "  --sleep_interval n      Set sleep-interval to n\n"
+      "  --wu_id n               Process WU with given ID\n"
       "  -d n, --debug_level n   Set log verbosity level, 1-4\n"
       "  -h | --help             Show this\n"
       "  -v | --version          Show version information\n";
@@ -830,6 +839,9 @@ int main(int argc, char** argv) {
             max_runtime = atof(argv[++i]);
         } else if (is_arg(argv[i], "no_credit")) {
             no_credit = true;
+        } else if (is_arg(argv[i], "wu_id")) {
+            wu_id = atoi(argv[++i]);
+            one_pass = true;
         } else {
             //log_messages.printf(MSG_CRITICAL, "unrecognized arg: %s\n", argv[i]);
         }
diff --git a/tools/create_work.cpp b/tools/create_work.cpp
index f9ce672..e0aed1e 100644
--- a/tools/create_work.cpp
+++ b/tools/create_work.cpp
@@ -442,7 +442,11 @@ int main(int argc, char** argv) {
                     retval = wu.insert_batch(values);
                     if (retval) {
                         fprintf(stderr,
-                            "wu.insert_batch() failed: %d\n", retval
+                            "wu.insert_batch() failed: %d; size %d\n",
+                            retval, (int)values.size()
+                        );
+                        fprintf(stderr,
+                            "MySQL error: %s\n", boinc_db.error_string()
                         );
                         exit(1);
                     }
@@ -455,6 +459,9 @@ int main(int argc, char** argv) {
                     fprintf(stderr,
                         "wu.insert_batch() failed: %d\n", retval
                     );
+                    fprintf(stderr,
+                        "MySQL error: %s\n", boinc_db.error_string()
+                    );
                     exit(1);
                 }
             }
diff --git a/tools/make_project b/tools/make_project
index 4156e33..6958e55 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -325,7 +325,8 @@ print >>open(httpd_conf_template_filename,'w'), '''
     # Note: projects/*/keys/ should NOT be readable!
 
     # in the following, the "Order" and "Allow" lines are for Apache 2.2;
-    # replace them with "Require all granted" for Apache 2.4
+    # for Apache 2.4, replace them with the single line
+    * Require all granted
 
     <Directory "%(proot)s/html">
         Options Indexes FollowSymlinks MultiViews
diff --git a/version.h.in b/version.h.in
index bc0e367..feefc44 100644
--- a/version.h.in
+++ b/version.h.in
@@ -22,7 +22,7 @@
 #define BOINC_VERSION_STRING "@BOINC_VERSION_STRING@"
 
 /* Package is a pre-release (Alpha/Beta) package */
-#define BOINC_PRERELEASE 1
+/* #define BOINC_PRERELEASE 1 */
 
 #if (defined(_WIN32) || defined(__APPLE__))
 /* Name of package */
diff --git a/zip/boinc_zip.xcodeproj/project.pbxproj b/zip/boinc_zip.xcodeproj/project.pbxproj
index 9785ba9..7150c96 100644
--- a/zip/boinc_zip.xcodeproj/project.pbxproj
+++ b/zip/boinc_zip.xcodeproj/project.pbxproj
@@ -271,6 +271,8 @@
 /* Begin PBXProject section */
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "boinc_zip" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
@@ -374,6 +376,7 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					_THREAD_SAFE,
@@ -381,6 +384,7 @@
 					DLL,
 					PIC,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				HEADER_SEARCH_PATHS = (
 					./,
 					../,
@@ -389,6 +393,7 @@
 					../lib/,
 				);
 				INSTALL_PATH = /usr/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_CFLAGS = (
 					"-I../",
 					"-Izip",
@@ -415,12 +420,14 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					_THREAD_SAFE,
 					UNIX,
 					DLL,
 					PIC,
 				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				HEADER_SEARCH_PATHS = (
 					./,
 					../,
@@ -429,6 +436,7 @@
 					../lib/,
 				);
 				INSTALL_PATH = /usr/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_CFLAGS = (
 					"-I../",
 					"-Izip",
@@ -453,14 +461,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = c99;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
+				STRINGS_FILE_OUTPUT_ENCODING = "UTF-8";
 			};
 			name = Development;
 		};
@@ -468,12 +476,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				SDKROOT = macosx;
+				STRINGS_FILE_OUTPUT_ENCODING = "UTF-8";
 			};
 			name = Deployment;
 		};
@@ -482,10 +490,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -508,7 +514,6 @@
 					"-lz",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
 			};
 			name = Development;
 		};
@@ -517,11 +522,9 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -536,7 +539,6 @@
 					"-lz",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
 			};
 			name = Deployment;
 		};
@@ -545,10 +547,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -571,7 +571,6 @@
 					"-lboinc_api",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
 			};
 			name = Development;
 		};
@@ -580,11 +579,9 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -599,7 +596,6 @@
 					"-lboinc_api",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
 			};
 			name = Deployment;
 		};

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git



More information about the pkg-boinc-commits mailing list